diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml index 9b88bbc052..c3dd2cf782 100644 --- a/.github/workflows/docs-build.yml +++ b/.github/workflows/docs-build.yml @@ -65,12 +65,12 @@ jobs: with: sparse-checkout: | docs - .github/workflows/scripts + .github/workflows/scripts/bash # Set environment path for scripts so we can access it later - name: Update environment path run: | - echo "${{ github.workspace }}/.github/workflows/scripts" >> $GITHUB_PATH + echo "${{ github.workspace }}/.github/workflows/scripts/bash" >> $GITHUB_PATH # Retrieve the generated changelogs - name: Download artifact changelog of FAF Develop @@ -90,7 +90,7 @@ jobs: run: | cat generated/fafdevelop.md >> changelog/fafdevelop.md cat generated/fafbeta.md >> changelog/fafbeta.md - + # Update the posts directory contents - name: Update changelog posts directory shell: bash diff --git a/.github/workflows/docs-changelog.yaml b/.github/workflows/docs-changelog.yaml index 93e0cbbb48..6ebcc89129 100644 --- a/.github/workflows/docs-changelog.yaml +++ b/.github/workflows/docs-changelog.yaml @@ -48,7 +48,7 @@ on: jobs: - # By verifying the snippets we ensure that they're compatible with the bundling + # By verifying the snippets we ensure that they're compatible with the bundling # process. In the future we can also add spell checking and/or checks for foul words. verify: @@ -56,14 +56,14 @@ jobs: runs-on: ubuntu-latest steps: - # We check out the scripts separate because the branch that we use to + # We check out the scripts separate because the branch that we use to # generate the changelog may not contain the scripts that we want to work with. - name: Checkout scripts uses: actions/checkout@v4 with: path: scripts sparse-checkout: | - .github/workflows/scripts + .github/workflows/scripts/bash - name: Checkout snippets uses: actions/checkout@v4 @@ -76,7 +76,7 @@ jobs: - name: Update environment path run: | ls - echo "${{ github.workspace }}/scripts/.github/workflows/scripts" >> $GITHUB_PATH + echo "${{ github.workspace }}/scripts/.github/workflows/scripts/bash" >> $GITHUB_PATH - name: Verify the changelog snippets working-directory: fa/changelog/snippets # script assumes it is in this directory @@ -84,7 +84,7 @@ jobs: changelog-verify.sh # During the bundling process we combine the templates, the sections and the snippets - # into a single changelog. + # into a single changelog. bundle: name: Bundle snippets @@ -92,14 +92,14 @@ jobs: needs: [verify] steps: - # We check out the scripts separate because the branch that we use to + # We check out the scripts separate because the branch that we use to # generate the changelog may not contain the scripts that we want to work with. - name: Checkout scripts uses: actions/checkout@v4 with: path: scripts sparse-checkout: | - .github/workflows/scripts + .github/workflows/scripts/bash - name: Checkout snippets uses: actions/checkout@v4 @@ -111,7 +111,7 @@ jobs: - name: Update environment path run: | - echo "${{ github.workspace }}/scripts/.github/workflows/scripts" >> $GITHUB_PATH + echo "${{ github.workspace }}/scripts/.github/workflows/scripts/bash" >> $GITHUB_PATH # We need to do this to remove `deploy/` from the reference. Specifically the `/` is problematic - name: Update reference diff --git a/.github/workflows/scripts/changelog-combine.sh b/.github/workflows/scripts/bash/changelog-combine.sh similarity index 100% rename from .github/workflows/scripts/changelog-combine.sh rename to .github/workflows/scripts/bash/changelog-combine.sh diff --git a/.github/workflows/scripts/changelog-links.sh b/.github/workflows/scripts/bash/changelog-links.sh similarity index 100% rename from .github/workflows/scripts/changelog-links.sh rename to .github/workflows/scripts/bash/changelog-links.sh diff --git a/.github/workflows/scripts/changelog-verify.sh b/.github/workflows/scripts/bash/changelog-verify.sh similarity index 100% rename from .github/workflows/scripts/changelog-verify.sh rename to .github/workflows/scripts/bash/changelog-verify.sh