diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 86b9f54..1841422 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -10,9 +10,16 @@ jobs: build-and-test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - name: Checkout mod repo + uses: actions/checkout@v2 with: fetch-depth: 0 + - name: Checkout workflows repo + uses: actions/checkout@v3 + with: + repository: GTNewHorizons/GTNH-Actions-Workflows + path: .gtnh-workflows + fetch-depth: 0 - name: Set up JDK 8 uses: actions/setup-java@v2 @@ -38,5 +45,5 @@ jobs: - name: Test no errors reported during server run run: | - chmod +x .github/scripts/test_no_error_reports - .github/scripts/test_no_error_reports + chmod +x .gtnh-workflows/scripts/test_no_error_reports + .gtnh-workflows/scripts/test_no_error_reports diff --git a/.github/workflows/release-tags.yml b/.github/workflows/release-tags.yml index b2e73dd..a27e081 100644 --- a/.github/workflows/release-tags.yml +++ b/.github/workflows/release-tags.yml @@ -5,14 +5,20 @@ name: Release tagged build on: workflow_call: + secrets: + MAVEN_USER: + required: false + MAVEN_PASSWORD: + required: false jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - name: Checkout mod repo + uses: actions/checkout@v2 with: - fetch-depth: 0 + fetch-depth: 32 - name: Set release version run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV @@ -47,3 +53,4 @@ jobs: env: MAVEN_USER: ${{ secrets.MAVEN_USER }} MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + if: ${{ env.MAVEN_USER != '' }} diff --git a/.github/scripts/test_no_error_reports b/scripts/test_no_error_reports similarity index 100% rename from .github/scripts/test_no_error_reports rename to scripts/test_no_error_reports diff --git a/.github/scripts/update_version b/scripts/update_version similarity index 100% rename from .github/scripts/update_version rename to scripts/update_version