diff --git a/.github/scripts/update_version b/.github/scripts/update_version index e30e018ba..3e5f752b0 100644 --- a/.github/scripts/update_version +++ b/.github/scripts/update_version @@ -9,4 +9,4 @@ if ! git diff --name-only HEAD HEAD~1 | grep -qF 'build.gradle'; then printf 'Updated buildscript version to %s\n' "$new_version" else printf 'Ignored buildscript version update: no changes detected\n' -fi \ No newline at end of file +fi diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 5f6fb2ac9..3ee2f686f 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -3,11 +3,11 @@ name: Build and test on: pull_request: - branches: [ 1.7.10, 1.7.10-dev ] + branches: [ master, main ] push: - branches: [ 1.7.10, 1.7.10-dev ] + branches: [ master, main ] jobs: build-and-test: uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master - secrets: inherit \ No newline at end of file + secrets: inherit diff --git a/.github/workflows/release-tags.yml b/.github/workflows/release-tags.yml index dee08b70f..e4c0be6b0 100644 --- a/.github/workflows/release-tags.yml +++ b/.github/workflows/release-tags.yml @@ -9,66 +9,6 @@ permissions: contents: write jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout mod repo - uses: actions/checkout@v3 - with: - fetch-depth: 32 - - - name: Set release version - run: | - IFS='-' read -r mv pv <<< "${GITHUB_REF#refs/*/}" - echo "MC_VERSION=${mv}" >> $GITHUB_ENV - echo "RELEASE_VERSION=${pv}" >> $GITHUB_ENV - echo "VERSION=${pv}" >> $GITHUB_ENV - - - name: Set up JDK 8 - uses: actions/setup-java@v3 - with: - java-version: '8' - distribution: 'temurin' - cache: gradle - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - - name: Setup the workspace - run: ./gradlew --info --stacktrace ${{ inputs.workspace }} - - - name: Build the mod - run: ./gradlew --info --stacktrace build - - # Continue on error in the following steps to make sure releases still get made even if one of the methods fails - - - name: Delete old release if it already exists - run: gh release delete --yes "${MC_VERSION}-${RELEASE_VERSION}" - continue-on-error: true - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Release under current tag - run: | - export "CHANGELOG_FILE=$(mktemp --suffix=.md)" - echo "CHANGELOG_FILE=${CHANGELOG_FILE}" >> $GITHUB_ENV - gh api --method POST -H "Accept: application/vnd.github+json" \ - "/repos/${GITHUB_REPOSITORY}/releases/generate-notes" \ - -f tag_name="${MC_VERSION}-${RELEASE_VERSION}" \ - --jq ".body" > "${CHANGELOG_FILE}" - cat "${CHANGELOG_FILE}" - gh release create "${MC_VERSION}-${RELEASE_VERSION}" -F "${CHANGELOG_FILE}" ./build/libs/*.jar - shell: bash - continue-on-error: true - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Publish to Maven, Modrinth and CurseForge - run: ./gradlew --info --stacktrace build publish - continue-on-error: true - env: - MAVEN_USER: ${{ secrets.MAVEN_USER }} - MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} - CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} - if: ${{ env.MAVEN_USER != '' }} \ No newline at end of file + release-tags: + uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master + secrets: inherit