Asdf support (#159)

* asdf support take 1 * asdf support take 2 * Added asdf support * whoops * add shell * Added stdin token * registry login * both need to be on asdf-support * asdf all the things * infer tool versions * bash of course * blah * fixed mockery versioning * forced rename based on mockery issue * golang ci lint version * no dash * reorganize and simplify * use posix space * version and not buf_version * update to v4 * all to asdf support * v4 of download artifact * move to v0 tag
wishabi · Mar 26, 2024 · cda70be · cda70be
1 parent b597939
commit cda70be
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 22 deletions.
diff --git a/.github/workflows/main-version-update.yml b/.github/workflows/main-version-update.yml
@@ -17,7 +17,7 @@ jobs:
   tag:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Git config

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
   units:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/setup-node@v3
       with:
         node-version: 16
@@ -22,7 +22,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ./
       with:
         milliseconds: 1000
diff --git a/cache/action.yml b/cache/action.yml
@@ -15,7 +15,7 @@ inputs:
 runs:
   using: 'composite'
   steps:
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: ${{ inputs.DEPLOY_CACHE_PATH }}
         key: ${{ inputs.DEPLOY_CACHE_KEY }}
diff --git a/deploy/eks/action.yml b/deploy/eks/action.yml
@@ -54,7 +54,7 @@ runs:
         aws-access-key-id: ${{ inputs.AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ inputs.AWS_SECRET_ACCESS_KEY }}
         aws-region: ${{ inputs.AWS_REGION }}
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Cleaning workspace
       shell: bash
       run: shopt -s dotglob && rm -rf "${{ github.workspace }}"/*

diff --git a/deploy/lambda/go/action.yml b/deploy/lambda/go/action.yml
@@ -13,7 +13,7 @@ inputs:
 runs:
   using: 'composite'
   steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Cleaning workspace
       shell: bash
       run: shopt -s dotglob && rm -rf "${{ github.workspace }}"/*

diff --git a/go/configure/action.yml b/go/configure/action.yml
@@ -20,16 +20,23 @@ runs:
   using: "composite"
   steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: ${{ inputs.FETCH_DEPTH }}
     - name: Setting up private modules access
       shell: bash
       run: git config --global url."https://${{ inputs.FLIPPCIRCLECIPULLER_REPO_TOKEN }}:[email protected]/wishabi".insteadOf "https://github.com/wishabi"
+    - name: Grab buf version
+      if: ${{ hashFiles('.tool-versions') != '' }}
+      run: |
+        BUF_VERSION=$(awk '/^buf[[:space:]]+/ {print $2}' .tool-versions)
+        echo "BUF_VERSION=${BUF_VERSION}" >> $GITHUB_ENV
+      shell: bash
     - name: Setting up buf
       uses: bufbuild/buf-setup-action@v1
       if: "${{ inputs.BUF_BUILD_API_TOKEN != '' }}"
       with:
         github_token: ${{ inputs.FLIPPCIRCLECIPULLER_REPO_TOKEN }}
         buf_user: ${{ inputs.BUF_BUILD_USER }}
         buf_api_token: ${{ inputs.BUF_BUILD_API_TOKEN }}
+        version: ${{ env.BUF_VERSION }}
diff --git a/go/deps/action.yml b/go/deps/action.yml
@@ -15,7 +15,7 @@ runs:
   steps:
     - name: Restoring vendor modules from cache
       id: vendor-cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: vendor
         key: vendor-cache-${{ hashFiles('go.mod','go.sum') }}
@@ -36,9 +36,20 @@ runs:
     - name: Run go generate
       run: go generate ./...
       shell: bash
+    - name: Grab mockery version
+      if: ${{ hashFiles('.tool-versions') != '' }}
+      run: |
+        MOCKERY_INSTALL_VERSION=$(awk '/^mockery[[:space:]]+/ {print "v"$2}' .tool-versions)
+        echo "MOCKERY_INSTALL_VERSION=${MOCKERY_INSTALL_VERSION}" >> $GITHUB_ENV
+      shell: bash
     - name: Install mockery
       if: ${{ hashFiles('.mockery.yml') != '' }}
-      run: go install github.com/vektra/mockery/v2
+      run: |
+        if [ -n "${{ env.MOCKERY_INSTALL_VERSION }}" ]; then
+          go install github.com/vektra/mockery/v2@${{ env.MOCKERY_INSTALL_VERSION }}
+        else
+          go install github.com/vektra/mockery/v2
+        fi
       shell: bash
     - name: Generate mocks
       if: ${{ hashFiles('.mockery.yml') != '' }}

diff --git a/go/lint/action.yml b/go/lint/action.yml
@@ -58,12 +58,18 @@ runs:
     - name: Setup safe directory
       shell: bash
       run: git config --global --add safe.directory ${{ inputs.WORKSPACE || github.workspace }}
+    - name: Grab golangci-lint version
+      if: ${{ hashFiles('.tool-versions') != '' }}
+      run: |
+        GOLANGCI_LINT_VERSION=$(awk '/^golangci-lint[[:space:]]+/ {print "v"$2}' .tool-versions)
+        echo "GOLANGCI_LINT_VERSION=${GOLANGCI_LINT_VERSION}" >> $GITHUB_ENV
+      shell: bash
     - name: Run Go linter
-      uses: golangci/golangci-lint-action@v3
+      uses: golangci/golangci-lint-action@v4
       with:
         skip-cache: true
         args: --verbose
-        version: ${{ inputs.GOLANG_CI_LINT_VERSION }} # Optional - if blank, will use the action's default version resolution
+        version: ${{ env.GOLANGCI_LINT_VERSION || inputs.GOLANG_CI_LINT_VERSION }} # Optional - if blank, will use the action's default version resolution
     - name: Notify slack channel on failure
       if: failure() && inputs.SLACK_CHANNEL_ID != null && github.ref == 'refs/heads/main'
       uses: slackapi/[email protected]

diff --git a/go/test/action.yml b/go/test/action.yml
@@ -17,13 +17,13 @@ runs:
       shell: bash
       run: ${GITHUB_ACTION_PATH}/test.sh "${{ inputs.TAGS }}" "${{ inputs.TIMEOUT }}"
     - name: Uploading test report
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: "${{ github.sha }}-test-report.out"
         path: "./test-report.out"
         retention-days: 1
     - name: Uploading coverage report
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: "${{ github.sha }}-coverage.out"
         path: "./coverage.out"

diff --git a/ruby/deps/action.yml b/ruby/deps/action.yml
@@ -6,7 +6,7 @@ runs:
   steps:
     - name: Bundle cache
       id: bundle-cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: vendor/bundle
         key: rails-${{ hashFiles('Gemfile.lock') }}

diff --git a/ruby/lint/action.yml b/ruby/lint/action.yml
@@ -12,7 +12,7 @@ runs:
       env: 
         BUNDLE_DEPLOYMENT: true
     - name: 'Upload rubocop results'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: "${{ github.sha }}-lint-results.out"
         path: ./rubocop/rubocop.json

diff --git a/ruby/one-for-all/action.yml b/ruby/one-for-all/action.yml
@@ -5,7 +5,7 @@ runs:
   using: "composite"
   steps: 
     - name: Download test result
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: ${{ github.sha }}-test-report.out
         path: ./result/

diff --git a/ruby/test/action.yml b/ruby/test/action.yml
@@ -45,13 +45,13 @@ runs:
       run: |
         sed -i 's@${{ env.ROOT_PATH }}''@/github/workspace/@g' coverage.json
     - name: 'Upload coverage'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ github.sha }}-coverage.out
         path: ./coverage/coverage.json
         retention-days: 1
     - name: 'Upload test results'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ github.sha }}-test-report.out
         path: ./result/rspec.xml

diff --git a/sonarqube-scan/action.yml b/sonarqube-scan/action.yml
@@ -20,7 +20,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Set branch variable
@@ -39,16 +39,16 @@ runs:
       run: echo "short_sha=`echo ${GITHUB_SHA::7}`" > $GITHUB_OUTPUT
       shell: bash
     - name: Downloading test report
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: "${{ github.sha }}-test-report.out"
     - name: Downloading coverage report
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: "${{ github.sha }}-coverage.out"
     - name: Download linter results
       if: ${{ inputs.CHECK_LINTER == 'true' }}
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: "${{ github.sha }}-lint-results.out"
     - name: SonarQube Scan