diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml deleted file mode 100644 index 9b0294d3f3d..00000000000 --- a/.github/actions/checkout/action.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: 'Checkout' -description: 'Properly check out (with tags)' -runs: - using: "composite" - steps: - - uses: actions/checkout@v4 - if: !startsWith(github.ref, 'refs/tags/') - with: - fetch-depth: 100 - fetch-tags: true - # The action is buggy when building a tag - - run: git fetch origin --tags - shell: bash - if: startsWith(github.ref, 'refs/tags/') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d921c5ffcd..478b6493c5e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v4 + - run: git fetch origin --tags + shell: bash - uses: ./.github/actions/gradle-setup - name: Generate assets run: ./gradlew runData diff --git a/.github/workflows/export_guide.yml b/.github/workflows/export_guide.yml index 94b209cdc44..186afad2533 100644 --- a/.github/workflows/export_guide.yml +++ b/.github/workflows/export_guide.yml @@ -17,7 +17,9 @@ jobs: steps: - name: Install Software OpenGL Rendering run: sudo apt-get install xvfb libgl1-mesa-dri zopfli - - uses: ./.github/actions/checkout + - uses: actions/checkout@v4 + - run: git fetch origin --tags + shell: bash - uses: ./.github/actions/gradle-setup - name: Export Guide run: DRI_PRIME=0 xvfb-run ./gradlew runGuideexport diff --git a/.github/workflows/localization.yml b/.github/workflows/localization.yml index 8cc2db612de..f22218ae6de 100644 --- a/.github/workflows/localization.yml +++ b/.github/workflows/localization.yml @@ -10,7 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v4 + - run: git fetch origin --tags + shell: bash - uses: ./.github/actions/gradle-setup - uses: actions/setup-node@v2 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f718303fc32..53868fd30b0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,9 @@ jobs: VERSION: ${{ steps.prepare_artifact_metadata.outputs.VERSION }} steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v4 +- run: git fetch origin --tags + shell: bash - uses: ./.github/actions/gradle-setup - name: Build with Gradle env: @@ -89,7 +91,9 @@ jobs: needs: build runs-on: ubuntu-latest steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v4 +- run: git fetch origin --tags + shell: bash - uses: ./.github/actions/gradle-setup - name: Download build artifact uses: actions/download-artifact@v4 @@ -139,7 +143,9 @@ jobs: needs: build runs-on: ubuntu-latest steps: - - uses: ./.github/actions/checkout + - uses: actions/checkout@v4 + - run: git fetch origin --tags + shell: bash - uses: ./.github/actions/gradle-setup - name: Download build artifact uses: actions/download-artifact@v4