diff --git a/.github/workflows/semrel-02-rel.yml b/.github/workflows/semrel-02-rel.yml index a2c9e221d..869a5ecca 100644 --- a/.github/workflows/semrel-02-rel.yml +++ b/.github/workflows/semrel-02-rel.yml @@ -1,6 +1,7 @@ # refs: # - https://shipit.dev/posts/trigger-github-actions-on-pr-close.html # - https://github.com/orgs/community/discussions/26724 +# - https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#running-your-pull_request-workflow-when-a-pull-request-merges name: Release Testing @@ -14,7 +15,7 @@ on: jobs: rc: - if: github.event.pull_request.merged == true + if: ${{ github.event_name == "workflow_dispatch" || github.event.pull_request.merged == true }} uses: ./.github/workflows/semrel-rc.yml soak: needs: [rc] diff --git a/.github/workflows/semrel-e2e.yml b/.github/workflows/semrel-e2e.yml index fa2a9f9d0..9323b5224 100644 --- a/.github/workflows/semrel-e2e.yml +++ b/.github/workflows/semrel-e2e.yml @@ -12,7 +12,6 @@ on: jobs: pepr-build: - name: controller image runs-on: ubuntu-latest steps: - name: Harden Runner @@ -23,7 +22,7 @@ jobs: - name: clone pepr uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: - repository: defenseunicorns/pepr + repository: btlghrants/pepr-semrel path: pepr - name: "set env: PEPR" @@ -75,7 +74,7 @@ jobs: - name: clone pepr uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: - repository: defenseunicorns/pepr + repository: btlghrants/pepr-semrel path: pepr - name: "set env: PEPR" @@ -100,7 +99,7 @@ jobs: - name: create matrix run: | matrix=$( - node "$PEPR/.github/workflows/semrel-02-e2e-matrix.js" "$PEXEX" + node "$PEPR/.github/workflows/semrel-e2e-matrix.js" "$PEXEX" ) echo "matrix=${matrix}" >> "$GITHUB_OUTPUT" id: create-matrix