diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 40d21c0..0d3abb5 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -23,26 +23,19 @@ jobs: fetch-depth: 0 - name: Download dangerfile.js - env: - WORKFLOW_VERSION: ${{ inputs._workflow_version }} - RUNNER_TEMP: ${{ runner.temp }} - run: wget "https://raw.githubusercontent.com/getsentry/github-workflows/$WORKFLOW_VERSION/danger/dangerfile.js" -P "$RUNNER_TEMP" + run: wget https://raw.githubusercontent.com/getsentry/github-workflows/${{ inputs._workflow_version }}/danger/dangerfile.js -P ${{ runner.temp }} # Using a pre-built docker image in GitHub container registry instaed of NPM to reduce possible attack vectors. - name: Run DangerJS id: danger - env: - GITHUB_WORKSPACE: ${{ github.workspace }} - RUNNER_TEMP: ${{ runner.temp }} - GITHUB_TOKEN: ${{ github.token }} run: | docker run \ - --volume "$GITHUB_WORKSPACE":/github/workspace \ - --volume "$RUNNER_TEMP":"$RUNNER_TEMP" \ + --volume ${{ github.workspace }}:/github/workspace \ + --volume ${{ runner.temp }}:${{ runner.temp }} \ --workdir /github/workspace \ --user $UID \ -e "INPUT_ARGS" -e "GITHUB_JOB" -e "GITHUB_REF" -e "GITHUB_SHA" -e "GITHUB_REPOSITORY" -e "GITHUB_REPOSITORY_OWNER" -e "GITHUB_RUN_ID" -e "GITHUB_RUN_NUMBER" -e "GITHUB_RETENTION_DAYS" -e "GITHUB_RUN_ATTEMPT" -e "GITHUB_ACTOR" -e "GITHUB_TRIGGERING_ACTOR" -e "GITHUB_WORKFLOW" -e "GITHUB_HEAD_REF" -e "GITHUB_BASE_REF" -e "GITHUB_EVENT_NAME" -e "GITHUB_SERVER_URL" -e "GITHUB_API_URL" -e "GITHUB_GRAPHQL_URL" -e "GITHUB_REF_NAME" -e "GITHUB_REF_PROTECTED" -e "GITHUB_REF_TYPE" -e "GITHUB_WORKSPACE" -e "GITHUB_ACTION" -e "GITHUB_EVENT_PATH" -e "GITHUB_ACTION_REPOSITORY" -e "GITHUB_ACTION_REF" -e "GITHUB_PATH" -e "GITHUB_ENV" -e "GITHUB_STEP_SUMMARY" -e "RUNNER_OS" -e "RUNNER_ARCH" -e "RUNNER_NAME" -e "RUNNER_TOOL_CACHE" -e "RUNNER_TEMP" -e "RUNNER_WORKSPACE" -e "ACTIONS_RUNTIME_URL" -e "ACTIONS_RUNTIME_TOKEN" -e "ACTIONS_CACHE_URL" -e GITHUB_ACTIONS=true -e CI=true \ - -e GITHUB_TOKEN="$GITHUB_TOKEN" \ + -e GITHUB_TOKEN="${{ github.token }}" \ -e DANGER_DISABLE_TRANSPILATION="true" \ ghcr.io/danger/danger-js:11.3.1 \ - --failOnErrors --dangerfile "$RUNNER_TEMP"/dangerfile.js + --failOnErrors --dangerfile ${{ runner.temp }}/dangerfile.js diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 85a2118..7b70200 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -111,30 +111,21 @@ jobs: - name: Check out workflow scripts # Note: cannot use `actions/checkout` at the moment because you can't clone outside of the repo root. # Follow https://github.com/actions/checkout/issues/197 - env: - RUNNER_TEMP: ${{ runner.temp }} - WORKFLOW_VERSION: ${{ inputs._workflow_version }} run: | - mkdir -p "$RUNNER_TEMP/ghwf" - cd "$RUNNER_TEMP/ghwf" + mkdir -p ${{ runner.temp }}/ghwf + cd ${{ runner.temp }}/ghwf git init git remote add origin https://github.com/getsentry/github-workflows.git - git fetch --depth 1 origin "$WORKFLOW_VERSION" + git fetch --depth 1 origin ${{ inputs._workflow_version }} git checkout FETCH_HEAD - name: Update to the latest version id: target - env: - RUNNER_TEMP: ${{ runner.temp }} - INPUT_PATH: ${{ inputs.path }} - INPUT_PATTERN: ${{ inputs.pattern }} - run: "$env:RUNNER_TEMP/ghwf/updater/scripts/update-dependency.ps1" -Path "$env:INPUT_PATH" -Pattern "$env:INPUT_PATTERN" + run: ${{ runner.temp }}/ghwf/updater/scripts/update-dependency.ps1 -Path '${{ inputs.path }}' -Pattern '${{ inputs.pattern }}' - name: Get the base repo info if: steps.target.outputs.latestTag != steps.target.outputs.originalTag id: root - env: - RUNNER_TEMP: ${{ runner.temp }} run: | $mainBranch = $(git remote show origin | Select-String "HEAD branch: (.*)").Matches[0].Groups[1].Value $prBranch = switch ('${{ inputs.pr-strategy }}') @@ -145,7 +136,7 @@ jobs: } "baseBranch=$mainBranch" | Tee-Object $env:GITHUB_OUTPUT -Append "prBranch=$prBranch" | Tee-Object $env:GITHUB_OUTPUT -Append - $nonBotCommits = "$env:RUNNER_TEMP/ghwf/updater/scripts/nonbot-commits.ps1" ` + $nonBotCommits = ${{ runner.temp }}/ghwf/updater/scripts/nonbot-commits.ps1 ` -RepoUrl "$(git config --get remote.origin.url)" -PrBranch $prBranch -MainBranch $mainBranch $changed = $nonBotCommits.Length -gt 0 ? 'true' : 'false' "changed=$changed" | Tee-Object $env:GITHUB_OUTPUT -Append @@ -159,10 +150,8 @@ jobs: id: existing-pr env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_REPOSITORY: ${{ github.repository }} - GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }} run: | - $urls = @(gh api "repos/$GITHUB_REPOSITORY/pulls?base=${{ steps.root.outputs.baseBranch }}&head=$GITHUB_REPOSITORY_OWNER:${{ steps.root.outputs.prBranch }}" --jq '.[].html_url') + $urls = @(gh api 'repos/${{ github.repository }}/pulls?base=${{ steps.root.outputs.baseBranch }}&head=${{ github.repository_owner }}:${{ steps.root.outputs.prBranch }}' --jq '.[].html_url') if ($urls.Length -eq 0) { "url=" | Tee-Object $env:GITHUB_OUTPUT -Append @@ -181,17 +170,12 @@ jobs: - name: Get target changelog if: ${{ ( steps.target.outputs.latestTag != steps.target.outputs.originalTag ) && ( steps.root.outputs.changed == 'false') }} - env: - RUNNER_TEMP: ${{ runner.temp }} - TARGET_URL: ${{ steps.target.outputs.url }} - ORIGINAL_TAG: ${{ steps.target.outputs.originalTag }} - LATEST_TAG: ${{ steps.target.outputs.latestTag }} run: | - $changelog = "$env:RUNNER_TEMP/ghwf/updater/scripts/get-changelog.ps1" ` - -RepoUrl "$env:TARGET_URL" ` - -OldTag "$env:ORIGINAL_TAG" ` - -NewTag "$env:LATEST_TAG" - "$env:RUNNER_TEMP/ghwf/updater/scripts/set-github-env.ps1" TARGET_CHANGELOG $changelog + $changelog = ${{ runner.temp }}/ghwf/updater/scripts/get-changelog.ps1 ` + -RepoUrl '${{ steps.target.outputs.url }}' ` + -OldTag '${{ steps.target.outputs.originalTag }}' ` + -NewTag '${{ steps.target.outputs.latestTag }}' + ${{ runner.temp }}/ghwf/updater/scripts/set-github-env.ps1 TARGET_CHANGELOG $changelog # First we create a PR only if it doesn't exist. We will later overwrite the content with the same action. - name: Create a PR @@ -239,32 +223,19 @@ jobs: - name: 'After new PR: redo the update' if: ${{ ( steps.target.outputs.latestTag != steps.target.outputs.originalTag ) && ( steps.existing-pr.outputs.url == '') && ( steps.root.outputs.changed == 'false') }} - env: - RUNNER_TEMP: ${{ runner.temp }} - INPUT_PATH: ${{ inputs.path }} - LATEST_TAG: ${{ steps.target.outputs.latestTag }} - run: "$env:RUNNER_TEMP/ghwf/updater/scripts/update-dependency.ps1" -Path "$env:INPUT_PATH" -Tag "$env:LATEST_TAG" + run: ${{ runner.temp }}/ghwf/updater/scripts/update-dependency.ps1 -Path '${{ inputs.path }}' -Tag '${{ steps.target.outputs.latestTag }}' - name: Update Changelog if: ${{ inputs.changelog-entry && ( steps.target.outputs.latestTag != steps.target.outputs.originalTag ) && ( steps.root.outputs.changed == 'false') }} - env: - RUNNER_TEMP: ${{ runner.temp }} - INPUT_NAME: ${{ inputs.name }} - PR_URL: ${{ steps.pr.outputs.url }} - TARGET_URL: ${{ steps.target.outputs.url }} - MAIN_BRANCH: ${{ steps.target.outputs.mainBranch }} - ORIGINAL_TAG: ${{ steps.target.outputs.originalTag }} - LATEST_TAG: ${{ steps.target.outputs.latestTag }} - CHANGELOG_SECTION: ${{ inputs.changelog-section }} run: | - "$env:RUNNER_TEMP/ghwf/updater/scripts/update-changelog.ps1" ` - -Name "$env:INPUT_NAME" ` - -PR "$env:PR_URL" ` - -RepoUrl "$env:TARGET_URL" ` - -MainBranch "$env:MAIN_BRANCH" ` - -OldTag "$env:ORIGINAL_TAG" ` - -NewTag "$env:LATEST_TAG" ` - -Section "$env:CHANGELOG_SECTION" + ${{ runner.temp }}/ghwf/updater/scripts/update-changelog.ps1 ` + -Name '${{ inputs.name }}' ` + -PR '${{ steps.pr.outputs.url }}' ` + -RepoUrl '${{ steps.target.outputs.url }}' ` + -MainBranch '${{ steps.target.outputs.mainBranch }}' ` + -OldTag '${{ steps.target.outputs.originalTag }}' ` + -NewTag '${{ steps.target.outputs.latestTag }}' ` + -Section '${{ inputs.changelog-section }}' - run: git --no-pager diff if: ${{ ( steps.target.outputs.latestTag != steps.target.outputs.originalTag ) && ( steps.root.outputs.changed == 'false') }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 81e0c34..5b470d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 2.13.1 + +### Fixes + +- Updater - invalid workflow syntax - reverts recent switch to env vars ([#97](https://github.com/getsentry/github-workflows/pull/97)) + ## 2.13.0 ### Features diff --git a/sentry-cli/integration-test/action.yml b/sentry-cli/integration-test/action.yml index cf6fa2d..79d3158 100644 --- a/sentry-cli/integration-test/action.yml +++ b/sentry-cli/integration-test/action.yml @@ -16,9 +16,6 @@ runs: steps: - name: Run tests shell: pwsh - env: - GITHUB_ACTION_PATH: ${{ github.action_path }} - INPUT_PATH: ${{ inputs.path }} run: | - Import-Module -Name "$env:GITHUB_ACTION_PATH/action.psm1" -Force - Invoke-Pester -Output Detailed "$env:INPUT_PATH" + Import-Module -Name ${{ github.action_path }}/action.psm1 -Force + Invoke-Pester -Output Detailed '${{ inputs.path }}'