From 81853fa47fc634e00f801c8e86fd4d42e7b7e7fa Mon Sep 17 00:00:00 2001 From: Mark Ridgwell Date: Wed, 13 Mar 2024 10:53:58 +0000 Subject: [PATCH] Rolled back actions/checkout to 4.1.1 as github have withdrawn 4.1.2 as it broke everything https://github.com/actions/checkout/issues/1651 --- .github/actions/build/action.yml | 9 +-- .../build-and-publish-pre-release.yml | 3 +- .../workflows/build-and-publish-release.yml | 3 +- .../create-prs-for-stale-branches.yml | 8 ++- .github/workflows/pr-lint.yml | 66 +++++++++++++++---- .github/workflows/pull-request.yml | 3 +- .github/workflows/reformat-sql.yml | 3 +- .github/workflows/reformat-yaml.yml | 3 +- .github/workflows/update-labels.yml | 3 +- 9 files changed, 73 insertions(+), 28 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index d0416157..3328dc74 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -123,14 +123,9 @@ runs: core.info('NUGET_ADDITIONAL_RESTORE_FEED_PRERELEASE: ${{inputs.NUGET_ADDITIONAL_RESTORE_FEED_PRERELEASE}}'); core.info('NUGET_PACK: ${{inputs.NUGET_PACK}}'); - - name: "Fetch tags and master" + - name: "Set branch" shell: bash - run: | - git fetch --tags - echo "REF: $GITHUB_REF" - echo "SHA: $GITHUB_SHA" - echo "GIT_BRANCH=$GITHUB_REF" >> "$GITHUB_ENV" - git branch --remote + run: echo "GIT_BRANCH=$GITHUB_REF" >> "$GITHUB_ENV" - name: "Check file existence" id: check_files diff --git a/.github/workflows/build-and-publish-pre-release.yml b/.github/workflows/build-and-publish-pre-release.yml index cbb2bfe6..5e2f5d21 100644 --- a/.github/workflows/build-and-publish-pre-release.yml +++ b/.github/workflows/build-and-publish-pre-release.yml @@ -40,9 +40,10 @@ jobs: run: sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE" - name: "Checkout Source" - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 + fetch-tags: true - name: "Check Repo Visibility" uses: credfeto/action-repo-visibility@v1.2.0 diff --git a/.github/workflows/build-and-publish-release.yml b/.github/workflows/build-and-publish-release.yml index e4b0a504..440302a3 100644 --- a/.github/workflows/build-and-publish-release.yml +++ b/.github/workflows/build-and-publish-release.yml @@ -26,9 +26,10 @@ jobs: run: sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE" - name: "Checkout Source" - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 + fetch-tags: true - name: "Check Repo Visibility" uses: credfeto/action-repo-visibility@v1.2.0 diff --git a/.github/workflows/create-prs-for-stale-branches.yml b/.github/workflows/create-prs-for-stale-branches.yml index 85e15a82..12558c66 100644 --- a/.github/workflows/create-prs-for-stale-branches.yml +++ b/.github/workflows/create-prs-for-stale-branches.yml @@ -33,10 +33,12 @@ jobs: - name: "Ensure JQ is installed" shell: bash run: sudo apt install -y jq + - name: "Checkout Source" - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 + fetch-tags: true ref: main repository: ${{github.repository}} @@ -67,10 +69,12 @@ jobs: - name: "Initialise Workspace" shell: bash run: sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE" + - name: "Checkout Source" - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 + fetch-tags: true ref: main repository: ${{github.repository}} diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml index 987f459b..0e7fc66f 100644 --- a/.github/workflows/pr-lint.yml +++ b/.github/workflows/pr-lint.yml @@ -41,9 +41,10 @@ jobs: # shell: bash # run: sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE" # - name: "Checkout Source" -# uses: actions/checkout@v4.1.2 +# uses: actions/checkout@v4.1.1 # with: # fetch-depth: 0 +# fetch-tags: true # - if: |- # !endsWith(github.repository, '-template') # && !startsWith(github.head_ref, 'release/') @@ -60,14 +61,21 @@ jobs: - name: "Initialise Workspace" shell: bash run: sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE" - - if: (github.actor != 'dependabot[bot]' && !endsWith(github.repository , '-template')) - uses: actions/checkout@v4.1.2 + + - name: "Checkout Source" + if: (github.actor != 'dependabot[bot]' && !endsWith(github.repository , '-template')) + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 - - if: (github.actor != 'dependabot[bot]' && !endsWith(github.repository , '-template')) + fetch-tags: true + + - name: "Diff Changes" + if: (github.actor != 'dependabot[bot]' && !endsWith(github.repository , '-template')) shell: bash run: echo "CHANGES=$(git diff --exit-code --no-patch --merge-base origin/main CHANGELOG.md 2> /dev/null && echo 0 || echo $?)" >> "$GITHUB_ENV" - - if: (github.actor != 'dependabot[bot]' && !endsWith(github.repository , '-template')) && env.CHANGES == '0' + + - name: "Report unchanged" + if: (github.actor != 'dependabot[bot]' && !endsWith(github.repository , '-template')) && env.CHANGES == '0' uses: actions/github-script@v7.0.1 with: script: | @@ -81,16 +89,20 @@ jobs: - name: "Initialise Workspace" shell: bash run: sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE" + - name: "Checkout Source" - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 + fetch-tags: true + - name: "Get version from global.json" if: (github.actor != 'dependabot[bot]' && !endsWith(github.repository , '-template')) uses: credfeto/action-dotnet-version-detect@v1.3.0 with: file: src/global.json fallback: 8.0.* + - name: "Install dotnet" if: (github.actor != 'dependabot[bot]' && !endsWith(github.repository , '-template')) uses: actions/setup-dotnet@v4.0.0 @@ -111,12 +123,14 @@ jobs: 7.0.* 8.0.* ${{env.DOTNET_VERSION}} + - name: "Check Runner details" uses: actions/github-script@v7.0.1 with: script: | core.info('Name: ${{runner.name}}'); core.info('OS: ${{runner.os}}'); + - name: "Enable Local nuget feeds if caching" if: startsWith(runner.name, 'buildagent-') id: nuget-local-cache @@ -127,6 +141,7 @@ jobs: echo "PRERELEASE_BAGET_CACHE=${{vars.PRERELEASE_BAGET_CACHE}}" echo "RELEASE_BAGET_CACHE=${{vars.RELEASE_BAGET_CACHE}}" }>> "$GITHUB_OUTPUT" + - name: "Configure nuget feeds" if: (github.actor != 'dependabot[bot]' && !endsWith(github.repository , '-template')) uses: ./.github/actions/nuget @@ -137,6 +152,7 @@ jobs: NUGET_ADDITIONAL_RESTORE_FEED_PRERELEASE_CACHE: "" NUGET_ADDITIONAL_RESTORE_FEED_RELEASE: ${{vars.NUGET_ADDITIONAL_RESTORE_FEED_RELEASE}} NUGET_ADDITIONAL_RESTORE_FEED_PRERELEASE: "" + - name: "Enable dotnet tools" if: (github.actor != 'dependabot[bot]' && !endsWith(github.repository , '-template')) shell: bash @@ -151,12 +167,14 @@ jobs: DOTNET_TC_QuickJitForLoops: "1" DOTNET_TieredPGO: "1" MSBUILDTERMINALLOGGER: "auto" + - name: "Install Changelog tool" if: (github.actor != 'dependabot[bot]' && !endsWith(github.repository , '-template')) uses: ./.github/actions/dotnet-tool with: TOOL_NAME: Credfeto.ChangeLog.Cmd TOOL_VERSION: latest + - name: "Check Changelog" if: (github.actor != 'dependabot[bot]' && !endsWith(github.repository , '-template')) shell: bash @@ -179,10 +197,13 @@ jobs: - name: "Initialise Workspace" shell: bash run: sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE" + - name: "Checkout Source" - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 + fetch-tags: true + - name: "Check for leaks" uses: DariuszPorowski/github-action-gitleaks@v2.0.9 id: gitleaks @@ -201,10 +222,13 @@ jobs: - name: "Initialise Workspace" shell: bash run: sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE" + - name: "Checkout Source" - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 + fetch-tags: true + - name: "Check for merge conflicts" uses: olivernybroe/action-conflict-finder@v4.0 @@ -215,10 +239,13 @@ jobs: - name: "Initialise Workspace" shell: bash run: sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE" + - name: "Checkout Source" - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 + fetch-tags: true + - name: "Check for case conflicts" uses: credfeto/action-case-checker@v1.3.0 @@ -229,10 +256,13 @@ jobs: - name: "Initialise Workspace" shell: bash run: sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE" + - name: "Checkout Source" - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 + fetch-tags: true + - name: "Check for ignored files" uses: credfeto/action-no-ignored-files@v1.2.0 @@ -244,6 +274,7 @@ jobs: - name: "Initialise Workspace" shell: bash run: sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE" + - uses: credfeto/action-repo-visibility@v1.2.0 id: visibility with: @@ -251,11 +282,14 @@ jobs: repository: ${{github.repository}} # optional parameter defaults to the current user token: ${{github.token}} + - name: "Checkout Source" if: steps.visibility.outputs.is_public == 'true' - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 + fetch-tags: true + - name: 'Dependency Review' if: steps.visibility.outputs.is_public == 'true' uses: actions/dependency-review-action@v4.1.3 @@ -268,10 +302,13 @@ jobs: - name: "Initialise Workspace" shell: bash run: sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE" + - name: "Checkout Source" - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 + fetch-tags: true + - name: "Check for merge commits" uses: greenled/no-merge-commits-check@v1.0.1 @@ -284,10 +321,13 @@ jobs: - name: "Initialise Workspace" shell: bash run: sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE" + - name: "Checkout Source" - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 + fetch-tags: true + - name: "Run Linter" uses: github/super-linter@v5.0.0 env: diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 4dcfc2c2..50d16960 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -51,9 +51,10 @@ jobs: run: sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE" - name: "Checkout source" - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.1 with: fetch-depth: 1 + fetch-tags: true - name: "Find PR For branch" uses: juliangruber/find-pull-request-action@v1.8.1 diff --git a/.github/workflows/reformat-sql.yml b/.github/workflows/reformat-sql.yml index 71fa3ba9..fc9a1ad7 100644 --- a/.github/workflows/reformat-sql.yml +++ b/.github/workflows/reformat-sql.yml @@ -33,9 +33,10 @@ jobs: run: sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE" - name: "Checkout Source" - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 + fetch-tags: true token: ${{secrets.SOURCE_PUSH_TOKEN}} - name: "Reformat" diff --git a/.github/workflows/reformat-yaml.yml b/.github/workflows/reformat-yaml.yml index 4e6abd7e..125f616e 100644 --- a/.github/workflows/reformat-yaml.yml +++ b/.github/workflows/reformat-yaml.yml @@ -34,9 +34,10 @@ jobs: run: sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE" - name: "Checkout Source" - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 + fetch-tags: true token: ${{secrets.SOURCE_PUSH_TOKEN}} - name: "Reformat" diff --git a/.github/workflows/update-labels.yml b/.github/workflows/update-labels.yml index 280f3d24..f5e180f7 100644 --- a/.github/workflows/update-labels.yml +++ b/.github/workflows/update-labels.yml @@ -22,9 +22,10 @@ jobs: shell: bash run: sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE" - name: "Checkout Source" - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 + fetch-tags: true token: ${{secrets.SOURCE_PUSH_TOKEN}} - name: "Update Github label config" if: success()