diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml index e05f278ae..b9da06f2e 100644 --- a/.github/workflows/cross-compile.yml +++ b/.github/workflows/cross-compile.yml @@ -8,7 +8,7 @@ env: jobs: create-branch: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - run: echo "precompiled_branch=$(git branch --show-current)-precompiled-natives" >> $GITHUB_ENV @@ -31,7 +31,7 @@ jobs: base_rev: ${{ env.rev }} linux-windows: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest needs: create-branch strategy: matrix: @@ -104,7 +104,7 @@ jobs: run: docker pull ${{ matrix.image }} - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: 11 distribution: temurin @@ -154,7 +154,7 @@ jobs: uses: actions/checkout@v3 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: 11 distribution: temurin @@ -181,3 +181,18 @@ jobs: git add src/main/resources-precompiled/** git commit --allow-empty -m "Precompiled natives (@${{ needs.create-branch.outputs.base_rev }}) for ${{ matrix.target }}" while git pull --rebase && ! git push; do sleep 5; done + + single-commit: + runs-on: ubuntu-latest + needs: [create-branch, linux-windows, macos] + steps: + - uses: actions/checkout@v3 + - name: Squash into one commit + run: | + git config --global user.email "${GITHUB_BOT_EMAIL}" + git config --global user.name "${GITHUB_BOT_NAME}" + git fetch && git checkout -t origin/${{ needs.create-branch.outputs.precompiled_branch }} + git reset --soft ${{ needs.create-branch.outputs.base_rev }} + git add src/main/resources-precompiled/** + git commit -m "Precompiled natives @${{ needs.create-branch.outputs.base_rev }}" + git push -f diff --git a/.github/workflows/release-new-version.yml b/.github/workflows/release-new-version.yml index aeaa6c19a..e62e71561 100644 --- a/.github/workflows/release-new-version.yml +++ b/.github/workflows/release-new-version.yml @@ -16,11 +16,11 @@ jobs: maven-central-release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - run: git config --global user.email "${GITHUB_BOT_EMAIL}" - run: git config --global user.name "${GITHUB_BOT_NAME}" - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: 11 distribution: temurin @@ -50,13 +50,13 @@ jobs: runs-on: ubuntu-latest needs: maven-central-release steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: ${{ needs.maven-central-release.outputs.releaseTag }} - run: git config --global user.email "${GITHUB_BOT_EMAIL}" - run: git config --global user.name "${GITHUB_BOT_NAME}" - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: 11 distribution: temurin @@ -77,7 +77,7 @@ jobs: env: ver: ${{ needs.maven-central-release.outputs.releaseVersion }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - run: | git config --global user.email "${GITHUB_BOT_EMAIL}" git config --global user.name "${GITHUB_BOT_NAME}" @@ -95,7 +95,7 @@ jobs: env: ver: ${{ needs.maven-central-release.outputs.releaseVersion }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: repository: ${{github.repository}}.wiki - run: |