From 99d15a8dddd797fe96ac11a1184a3bcb0a9802eb Mon Sep 17 00:00:00 2001 From: Matthew Turney Date: Mon, 18 Dec 2023 03:00:02 +0000 Subject: [PATCH 1/2] more tries at workflow stacking --- .github/workflows/build-and-deploy.yml | 11 +++++++++++ .github/workflows/release.yml | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index f2b5923..f4468eb 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -6,6 +6,11 @@ on: - 'v**' pull_request: workflow_dispatch: + inputs: + tag: + description: 'Tag to deploy' + required: true + type: string concurrency: group: 'pages' @@ -18,7 +23,13 @@ jobs: contents: read steps: - name: Checkout + if: github.event_name != 'workflow_dispatch' uses: actions/checkout@v4 + - name: Checkout tag + if: github.event_name == 'workflow_dispatch' + uses: actions/checkout@v4 + with: + ref: ${{ github.event.inputs.tag }} - name: Setup Node uses: actions/setup-node@v4 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f8915d9..4aae225 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,11 +18,11 @@ jobs: - name: Checkout Repo uses: actions/checkout@v4 with: - token: ${{ secrets.PAT }} + token: ${{ env.GITHUB_TOKEN }} - name: Configure git author run: | - git config --global user.name "github-actions[bot]" - git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" + git config --global user.name "github-actions" + git config --global user.email "github-actions@github.com" - name: Setup Node.js uses: actions/setup-node@v4 with: @@ -50,3 +50,4 @@ jobs: if: ${{ steps.release.outputs.release != '' }} run: | gh release create "v${{ steps.release.outputs.release }}" --generate-notes + gh workflow run build-and-deploy.yml --ref "${{ steps.release.outputs.release }}" From 707f7c6109693476ae5cf5c0c0f2d8880589aefc Mon Sep 17 00:00:00 2001 From: Matthew Turney Date: Mon, 18 Dec 2023 03:00:33 +0000 Subject: [PATCH 2/2] docs(changeset): more tries at workflow stacking --- .changeset/ninety-pumas-yell.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/ninety-pumas-yell.md diff --git a/.changeset/ninety-pumas-yell.md b/.changeset/ninety-pumas-yell.md new file mode 100644 index 0000000..c24f218 --- /dev/null +++ b/.changeset/ninety-pumas-yell.md @@ -0,0 +1,5 @@ +--- +"pho3nixf1re.net": patch +--- + +more tries at workflow stacking