From f3b9583f4e08f2188c5d06c0b104beff07c9c8e4 Mon Sep 17 00:00:00 2001 From: Trevor Whitney Date: Thu, 15 Feb 2024 13:36:54 -0700 Subject: [PATCH] chore: bump latest loki-release --- .github/jsonnetfile.lock.json | 4 +- .../loki-release/.github/workflows/check.yml | 28 +++--- .../.github/workflows/release-pr.yml | 6 -- .../.github/workflows/release.yml | 5 - .../grafana/loki-release/.golangci.yml | 93 +++++++++++++++++++ .../loki-release/workflows/common.libsonnet | 1 - .../loki-release/workflows/validate.libsonnet | 14 ++- .github/workflows/minor-release-pr.yml | 15 --- .github/workflows/patch-release-pr.yml | 15 --- .github/workflows/release.yml | 5 - 10 files changed, 122 insertions(+), 64 deletions(-) create mode 100644 .github/vendor/github.com/grafana/loki-release/.golangci.yml diff --git a/.github/jsonnetfile.lock.json b/.github/jsonnetfile.lock.json index d4dfdda02da50..0af19c13f304e 100644 --- a/.github/jsonnetfile.lock.json +++ b/.github/jsonnetfile.lock.json @@ -8,8 +8,8 @@ "subdir": "" } }, - "version": "1117091e97afba69e0b42e604fbf1d1311580db8", - "sum": "jdWgpGcECA1f1+tKlKrWU6aDo9S7mWJ9Gshf9OKQqgQ=" + "version": "a8dfe9aab48aea27205f30601002bdf42d6ccb39", + "sum": "O83xr9x/q6mEjCO+QqTaY50bzyeZGIyzVsLJP31cuTA=" } ], "legacyImports": false diff --git a/.github/vendor/github.com/grafana/loki-release/.github/workflows/check.yml b/.github/vendor/github.com/grafana/loki-release/.github/workflows/check.yml index eb4c5ee443dbb..763b7219a70de 100644 --- a/.github/vendor/github.com/grafana/loki-release/.github/workflows/check.yml +++ b/.github/vendor/github.com/grafana/loki-release/.github/workflows/check.yml @@ -16,11 +16,13 @@ "with": "path": "lib" "repository": "grafana/loki-release" + - "name": "fix git dubious ownership" + "run": | + git config --global --add safe.directory "$GITHUB_WORKSPACE" - "name": "install tar" "run": | apt update apt install -qy tar xz-utils - "shell": "bash" - "name": "install shellcheck" "uses": "./lib/actions/install-binary" "with": @@ -41,31 +43,24 @@ - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}" "name": "check generated files" "run": "make check-generated-files" - "shell": "bash" - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}" "name": "check mod" "run": "make check-mod" - "shell": "bash" - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}" "name": "check docs" "run": "make check-doc" - "shell": "bash" - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}" "name": "validate example configs" "run": "make validate-example-configs" - "shell": "bash" - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}" "name": "check example config docs" "run": "make check-example-config-doc" - "shell": "bash" - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}" "name": "check helm reference doc" "run": "make documentation-helm-reference-check" - "shell": "bash" - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}" "name": "check drone drift" "run": "make check-drone-drift" - "shell": "bash" "lint": "container": "image": "grafana/loki-build-image:0.33.0" @@ -81,11 +76,13 @@ "with": "path": "lib" "repository": "grafana/loki-release" + - "name": "fix git dubious ownership" + "run": | + git config --global --add safe.directory "$GITHUB_WORKSPACE" - "name": "install tar" "run": | apt update apt install -qy tar xz-utils - "shell": "bash" - "name": "install shellcheck" "uses": "./lib/actions/install-binary" "with": @@ -106,15 +103,17 @@ - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}" "name": "lint" "run": "make lint" - "shell": "bash" - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}" "name": "lint jsonnet" "run": "make lint-jsonnet" - "shell": "bash" - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}" "name": "lint scripts" "run": "make lint-scripts" - "shell": "bash" + - "name": "golangci-lint" + "uses": "golangci/golangci-lint-action@08e2f20817b15149a52b5b3ebe7de50aff2ba8c5" + "with": + "only-new-issues": true + "version": "v1.55.1" "test": "container": "image": "grafana/loki-build-image:0.33.0" @@ -130,11 +129,13 @@ "with": "path": "lib" "repository": "grafana/loki-release" + - "name": "fix git dubious ownership" + "run": | + git config --global --add safe.directory "$GITHUB_WORKSPACE" - "name": "install tar" "run": | apt update apt install -qy tar xz-utils - "shell": "bash" - "name": "install shellcheck" "uses": "./lib/actions/install-binary" "with": @@ -155,7 +156,6 @@ - "if": "${{ !fromJSON(env.SKIP_VALIDATION) }}" "name": "test" "run": "make test" - "shell": "bash" "name": "check" "on": "workflow_call": diff --git a/.github/vendor/github.com/grafana/loki-release/.github/workflows/release-pr.yml b/.github/vendor/github.com/grafana/loki-release/.github/workflows/release-pr.yml index bd66bb38705ea..98ac1a42a6d18 100644 --- a/.github/vendor/github.com/grafana/loki-release/.github/workflows/release-pr.yml +++ b/.github/vendor/github.com/grafana/loki-release/.github/workflows/release-pr.yml @@ -35,7 +35,6 @@ jobs: name: "extract branch name" run: | echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - env: SHA: "${{ github.sha }}" @@ -52,7 +51,6 @@ jobs: --target-branch "${{ steps.extract_branch.outputs.branch }}" \ --token="${{ secrets.GH_TOKEN }}" \ --versioning-strategy "${{ env.VERSIONING_STRATEGY }}" - shell: "bash" working-directory: "lib" dist: needs: @@ -98,7 +96,6 @@ jobs: echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE make dist packages EOF - shell: "bash" working-directory: "release" - name: "upload build artifacts" uses: "google-github-actions/upload-cloud-storage@v2" @@ -141,7 +138,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -192,7 +188,6 @@ jobs: name: "extract branch name" run: | echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - id: "version" name: "get release version" @@ -222,7 +217,6 @@ jobs: echo "version=${version}" >> $GITHUB_OUTPUT echo "pr_created=true" >> $GITHUB_OUTPUT fi - shell: "bash" working-directory: "lib" name: "create release PR" "on": diff --git a/.github/vendor/github.com/grafana/loki-release/.github/workflows/release.yml b/.github/vendor/github.com/grafana/loki-release/.github/workflows/release.yml index 99d5d69b6d78d..4a942e452266a 100644 --- a/.github/vendor/github.com/grafana/loki-release/.github/workflows/release.yml +++ b/.github/vendor/github.com/grafana/loki-release/.github/workflows/release.yml @@ -38,7 +38,6 @@ jobs: run: | echo "downloading binaries to $(pwd)/dist" gsutil cp -r gs://loki-build-artifacts/${{ needs.shouldRelease.outputs.sha }}/dist . - shell: "bash" working-directory: "release" - id: "release" name: "create release" @@ -50,7 +49,6 @@ jobs: --repo-url="${{ env.RELEASE_REPO }}" \ --target-branch "${{ needs.shouldRelease.outputs.branch }}" \ --token="${{ secrets.GH_TOKEN }}" - shell: "bash" working-directory: "lib" - env: GH_TOKEN: "${{ secrets.GH_TOKEN }}" @@ -59,7 +57,6 @@ jobs: run: | gh release upload ${{ needs.shouldRelease.outputs.name }} dist/* gh release edit ${{ needs.shouldRelease.outputs.name }} --draft=false - shell: "bash" working-directory: "release" publishImages: needs: @@ -92,7 +89,6 @@ jobs: run: | echo "downloading images to $(pwd)/images" gsutil cp -r gs://loki-build-artifacts/${{ needs.createRelease.outputs.sha }}/images . - shell: "bash" - name: "publish docker images" uses: "./lib/actions/push-images" with: @@ -120,7 +116,6 @@ jobs: name: "extract branch name" run: | echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - id: "should_release" name: "should a release be created?" diff --git a/.github/vendor/github.com/grafana/loki-release/.golangci.yml b/.github/vendor/github.com/grafana/loki-release/.golangci.yml new file mode 100644 index 0000000000000..a4df9934a80c7 --- /dev/null +++ b/.github/vendor/github.com/grafana/loki-release/.golangci.yml @@ -0,0 +1,93 @@ +# This file contains all available configuration options +# with their default values. + +# options for analysis running +run: + # define go version + go: "1.20" + + # default concurrency is a available CPU number + concurrency: 16 + + # timeout for analysis, e.g. 30s, 5m, default is 1m + timeout: 5m + + # exit code when at least one issue was found, default is 1 + issues-exit-code: 1 + + # include test files or not, default is true + tests: true + + # which dirs to skip: they won't be analyzed; + # can use regexp here: generated.*, regexp is applied on full path; + # default value is empty list, but next dirs are always skipped independently + # from this option's value: + # vendor$, third_party$, testdata$, examples$, Godeps$, builtin$ + skip-dirs: + - vendor + - node_modules + # which files to skip: they will be analyzed, but issues from them + # won't be reported. Default value is empty list, but there is + # no need to include all autogenerated files, we confidently recognize + # autogenerated files. If it's not please let us know. + skip-files: + - .*.pb.go + - .*.y.go + - .*.rl.go + - .*.deepcopy.go +# output configuration options +output: + # colored-line-number|line-number|json|tab|checkstyle, default is "colored-line-number" + format: colored-line-number + + # print lines of code with issue, default is true + print-issued-lines: true + + # print linter name in the end of issue text, default is true + print-linter-name: true + +linters-settings: + depguard: + rules: + Main: + allow: + - fmt + - github.com/hashicorp/go-uuid + + misspell: + ignore-words: + - strat + +linters: + enable: + - errcheck + - goconst + - revive + - ineffassign + - misspell + - unconvert + - govet + - typecheck + - depguard + - exportloopref + - gofmt + - goimports + - gosimple + - staticcheck + - gochecksumtype + disable: + - unused + - unparam + +issues: + exclude: + - Error return value of .*log\.Logger\)\.Log\x60 is not checked + - Error return value of .*.Log.* is not checked + - Error return value of `` is not checked + exclude-rules: + - path: pkg/scheduler/scheduler.go + text: 'SA1019: msg.GetHttpRequest is deprecated: Do not use' + - path: '(.+)_test\.go' + linters: + - goconst + fix: true diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/common.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/common.libsonnet index 8da15b02b6ba2..d50e5da166a15 100644 --- a/.github/vendor/github.com/grafana/loki-release/workflows/common.libsonnet +++ b/.github/vendor/github.com/grafana/loki-release/workflows/common.libsonnet @@ -9,7 +9,6 @@ with+: with, }, withRun: function(run) { - shell: 'bash', run: run, }, withId: function(id) { diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet index 6e7e96797b0d8..b909bfb2f25e0 100644 --- a/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet +++ b/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet @@ -7,6 +7,10 @@ local setupValidationDeps = function(job) job { steps: [ common.checkout, common.fetchReleaseLib, + step.new('fix git dubious ownership') + + step.withRun(||| + git config --global --add safe.directory "$GITHUB_WORKSPACE" + |||), step.new('install tar') + step.withRun(||| apt update @@ -61,7 +65,15 @@ function(buildImage) { validationMakeStep('lint', 'lint'), validationMakeStep('lint jsonnet', 'lint-jsonnet'), validationMakeStep('lint scripts', 'lint-scripts'), - ]) + ]) + { + steps+: [ + step.new('golangci-lint', 'golangci/golangci-lint-action@08e2f20817b15149a52b5b3ebe7de50aff2ba8c5') + + step.with({ + version: 'v1.55.1', + 'only-new-issues': true, + }), + ], + } ), check: setupValidationDeps( diff --git a/.github/workflows/minor-release-pr.yml b/.github/workflows/minor-release-pr.yml index fd016b90afd31..464223de26e80 100644 --- a/.github/workflows/minor-release-pr.yml +++ b/.github/workflows/minor-release-pr.yml @@ -44,7 +44,6 @@ jobs: name: "extract branch name" run: | echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - env: SHA: "${{ github.sha }}" @@ -61,7 +60,6 @@ jobs: --target-branch "${{ steps.extract_branch.outputs.branch }}" \ --token="${{ secrets.GH_TOKEN }}" \ --versioning-strategy "${{ env.VERSIONING_STRATEGY }}" - shell: "bash" working-directory: "lib" dist: needs: @@ -107,7 +105,6 @@ jobs: echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE make dist packages EOF - shell: "bash" working-directory: "release" - name: "upload build artifacts" uses: "google-github-actions/upload-cloud-storage@v2" @@ -150,7 +147,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -208,7 +204,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -266,7 +261,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -326,7 +320,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -384,7 +377,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -444,7 +436,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -504,7 +495,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -564,7 +554,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -622,7 +611,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -682,7 +670,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -731,7 +718,6 @@ jobs: name: "extract branch name" run: | echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - id: "version" name: "get release version" @@ -761,7 +747,6 @@ jobs: echo "version=${version}" >> $GITHUB_OUTPUT echo "pr_created=true" >> $GITHUB_OUTPUT fi - shell: "bash" working-directory: "lib" name: "create release PR" "on": diff --git a/.github/workflows/patch-release-pr.yml b/.github/workflows/patch-release-pr.yml index 1dd737174862d..66ffdce48d695 100644 --- a/.github/workflows/patch-release-pr.yml +++ b/.github/workflows/patch-release-pr.yml @@ -44,7 +44,6 @@ jobs: name: "extract branch name" run: | echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - env: SHA: "${{ github.sha }}" @@ -61,7 +60,6 @@ jobs: --target-branch "${{ steps.extract_branch.outputs.branch }}" \ --token="${{ secrets.GH_TOKEN }}" \ --versioning-strategy "${{ env.VERSIONING_STRATEGY }}" - shell: "bash" working-directory: "lib" dist: needs: @@ -107,7 +105,6 @@ jobs: echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE make dist packages EOF - shell: "bash" working-directory: "release" - name: "upload build artifacts" uses: "google-github-actions/upload-cloud-storage@v2" @@ -150,7 +147,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -208,7 +204,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -266,7 +261,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -326,7 +320,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -384,7 +377,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -444,7 +436,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -504,7 +495,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -564,7 +554,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -622,7 +611,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -682,7 +670,6 @@ jobs: platform="$(echo "${{ matrix.platform}}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")" echo "platform=${platform}" >> $GITHUB_OUTPUT echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - if: "${{ fromJSON(needs.version.outputs.pr_created) }}" name: "Build and export" @@ -731,7 +718,6 @@ jobs: name: "extract branch name" run: | echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - id: "version" name: "get release version" @@ -761,7 +747,6 @@ jobs: echo "version=${version}" >> $GITHUB_OUTPUT echo "pr_created=true" >> $GITHUB_OUTPUT fi - shell: "bash" working-directory: "lib" name: "create release PR" "on": diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6991ebe3f2cb2..64970d1bd7192 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,6 @@ jobs: run: | echo "downloading binaries to $(pwd)/dist" gsutil cp -r gs://loki-build-artifacts/${{ needs.shouldRelease.outputs.sha }}/dist . - shell: "bash" working-directory: "release" - id: "release" name: "create release" @@ -50,7 +49,6 @@ jobs: --repo-url="${{ env.RELEASE_REPO }}" \ --target-branch "${{ needs.shouldRelease.outputs.branch }}" \ --token="${{ secrets.GH_TOKEN }}" - shell: "bash" working-directory: "lib" - env: GH_TOKEN: "${{ secrets.GH_TOKEN }}" @@ -59,7 +57,6 @@ jobs: run: | gh release upload ${{ needs.shouldRelease.outputs.name }} dist/* gh release edit ${{ needs.shouldRelease.outputs.name }} --draft=false - shell: "bash" working-directory: "release" publishImages: needs: @@ -89,7 +86,6 @@ jobs: run: | echo "downloading images to $(pwd)/images" gsutil cp -r gs://loki-build-artifacts/${{ needs.createRelease.outputs.sha }}/images . - shell: "bash" - name: "publish docker images" uses: "./lib/actions/push-images" with: @@ -117,7 +113,6 @@ jobs: name: "extract branch name" run: | echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT - shell: "bash" working-directory: "release" - id: "should_release" name: "should a release be created?"