From aa7411c0bfae66165915779a48732c0d88b82edc Mon Sep 17 00:00:00 2001 From: Mark Raynsford Date: Sun, 5 May 2024 22:20:42 +0000 Subject: [PATCH] Update workflows. --- .../workflows/deploy.linux.temurin.lts.yml | 1 + .../workflows/main.linux.temurin.current.yml | 5 ++- .github/workflows/main.linux.temurin.lts.yml | 3 +- .../main.windows.temurin.current.yml | 5 ++- .../workflows/main.windows.temurin.lts.yml | 5 ++- .../workflows/pr.linux.temurin.current.yml | 41 +++++++++++++++++++ .github/workflows/pr.linux.temurin.lts.yml | 41 +++++++++++++++++++ .../workflows/pr.windows.temurin.current.yml | 41 +++++++++++++++++++ .github/workflows/pr.windows.temurin.lts.yml | 41 +++++++++++++++++++ 9 files changed, 175 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/pr.linux.temurin.current.yml create mode 100644 .github/workflows/pr.linux.temurin.lts.yml create mode 100644 .github/workflows/pr.windows.temurin.current.yml create mode 100644 .github/workflows/pr.windows.temurin.lts.yml diff --git a/.github/workflows/deploy.linux.temurin.lts.yml b/.github/workflows/deploy.linux.temurin.lts.yml index 96e4f6d..356053c 100644 --- a/.github/workflows/deploy.linux.temurin.lts.yml +++ b/.github/workflows/deploy.linux.temurin.lts.yml @@ -28,3 +28,4 @@ jobs: MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} run: .github/workflows/deploy-release.sh + diff --git a/.github/workflows/main.linux.temurin.current.yml b/.github/workflows/main.linux.temurin.current.yml index ef39f28..76ecd26 100644 --- a/.github/workflows/main.linux.temurin.current.yml +++ b/.github/workflows/main.linux.temurin.current.yml @@ -1,10 +1,9 @@ + name: main.linux.temurin.current on: push: branches: [ develop, feature/*, release/* ] - pull_request: - branches: [ develop ] jobs: build: @@ -38,3 +37,5 @@ jobs: name: test-logs path: ./com.io7m.dixmont.tests/target/surefire-reports + + diff --git a/.github/workflows/main.linux.temurin.lts.yml b/.github/workflows/main.linux.temurin.lts.yml index 9ebfb3e..431c589 100644 --- a/.github/workflows/main.linux.temurin.lts.yml +++ b/.github/workflows/main.linux.temurin.lts.yml @@ -1,10 +1,9 @@ + name: main.linux.temurin.lts on: push: branches: [ develop, feature/*, release/* ] - pull_request: - branches: [ develop ] jobs: build: diff --git a/.github/workflows/main.windows.temurin.current.yml b/.github/workflows/main.windows.temurin.current.yml index 4420a24..ba1f21f 100644 --- a/.github/workflows/main.windows.temurin.current.yml +++ b/.github/workflows/main.windows.temurin.current.yml @@ -1,10 +1,9 @@ + name: main.windows.temurin.current on: push: branches: [ develop, feature/*, release/* ] - pull_request: - branches: [ develop ] jobs: build: @@ -38,3 +37,5 @@ jobs: name: test-logs path: ./com.io7m.dixmont.tests/target/surefire-reports + + diff --git a/.github/workflows/main.windows.temurin.lts.yml b/.github/workflows/main.windows.temurin.lts.yml index 4362cbf..b8cad35 100644 --- a/.github/workflows/main.windows.temurin.lts.yml +++ b/.github/workflows/main.windows.temurin.lts.yml @@ -1,10 +1,9 @@ + name: main.windows.temurin.lts on: push: branches: [ develop, feature/*, release/* ] - pull_request: - branches: [ develop ] jobs: build: @@ -38,3 +37,5 @@ jobs: name: test-logs path: ./com.io7m.dixmont.tests/target/surefire-reports + + diff --git a/.github/workflows/pr.linux.temurin.current.yml b/.github/workflows/pr.linux.temurin.current.yml new file mode 100644 index 0000000..4226d0a --- /dev/null +++ b/.github/workflows/pr.linux.temurin.current.yml @@ -0,0 +1,41 @@ + +name: pr.linux.temurin.current + +on: + pull_request: + branches: [ develop, feature/*, release/* ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + submodules: true + + - name: JDK + uses: actions/setup-java@v4 + with: + java-version: 22 + distribution: 'temurin' + + - name: Collect project version + id: project_version + run: java .github/workflows/Tools.java ShowProjectVersion pom.xml >> "$GITHUB_OUTPUT" + + - name: Collect project snapshot + id: project_is_snapshot + run: java .github/workflows/Tools.java ShowProjectIsSnapshot pom.xml >> "$GITHUB_OUTPUT" + + - name: Build + run: mvn --batch-mode --strict-checksums --errors clean verify site + + - name: Upload test logs + uses: actions/upload-artifact@v4 + if: always() + with: + name: test-logs + path: ./com.io7m.dixmont.tests/target/surefire-reports + + + diff --git a/.github/workflows/pr.linux.temurin.lts.yml b/.github/workflows/pr.linux.temurin.lts.yml new file mode 100644 index 0000000..6715b74 --- /dev/null +++ b/.github/workflows/pr.linux.temurin.lts.yml @@ -0,0 +1,41 @@ + +name: pr.linux.temurin.lts + +on: + pull_request: + branches: [ develop, feature/*, release/* ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + submodules: true + + - name: JDK + uses: actions/setup-java@v4 + with: + java-version: 21 + distribution: 'temurin' + + - name: Collect project version + id: project_version + run: java .github/workflows/Tools.java ShowProjectVersion pom.xml >> "$GITHUB_OUTPUT" + + - name: Collect project snapshot + id: project_is_snapshot + run: java .github/workflows/Tools.java ShowProjectIsSnapshot pom.xml >> "$GITHUB_OUTPUT" + + - name: Build + run: mvn --batch-mode --strict-checksums --errors clean verify site + + - name: Upload test logs + uses: actions/upload-artifact@v4 + if: always() + with: + name: test-logs + path: ./com.io7m.dixmont.tests/target/surefire-reports + + + diff --git a/.github/workflows/pr.windows.temurin.current.yml b/.github/workflows/pr.windows.temurin.current.yml new file mode 100644 index 0000000..c135635 --- /dev/null +++ b/.github/workflows/pr.windows.temurin.current.yml @@ -0,0 +1,41 @@ + +name: pr.windows.temurin.current + +on: + pull_request: + branches: [ develop, feature/*, release/* ] + +jobs: + build: + runs-on: windows-latest + steps: + - uses: actions/checkout@v4 + with: + submodules: true + + - name: JDK + uses: actions/setup-java@v4 + with: + java-version: 22 + distribution: 'temurin' + + - name: Collect project version + id: project_version + run: java .github/workflows/Tools.java ShowProjectVersion pom.xml >> "$GITHUB_OUTPUT" + + - name: Collect project snapshot + id: project_is_snapshot + run: java .github/workflows/Tools.java ShowProjectIsSnapshot pom.xml >> "$GITHUB_OUTPUT" + + - name: Build + run: mvn --batch-mode --strict-checksums --errors clean verify site + + - name: Upload test logs + uses: actions/upload-artifact@v4 + if: always() + with: + name: test-logs + path: ./com.io7m.dixmont.tests/target/surefire-reports + + + diff --git a/.github/workflows/pr.windows.temurin.lts.yml b/.github/workflows/pr.windows.temurin.lts.yml new file mode 100644 index 0000000..04d5ac0 --- /dev/null +++ b/.github/workflows/pr.windows.temurin.lts.yml @@ -0,0 +1,41 @@ + +name: pr.windows.temurin.lts + +on: + pull_request: + branches: [ develop, feature/*, release/* ] + +jobs: + build: + runs-on: windows-latest + steps: + - uses: actions/checkout@v4 + with: + submodules: true + + - name: JDK + uses: actions/setup-java@v4 + with: + java-version: 21 + distribution: 'temurin' + + - name: Collect project version + id: project_version + run: java .github/workflows/Tools.java ShowProjectVersion pom.xml >> "$GITHUB_OUTPUT" + + - name: Collect project snapshot + id: project_is_snapshot + run: java .github/workflows/Tools.java ShowProjectIsSnapshot pom.xml >> "$GITHUB_OUTPUT" + + - name: Build + run: mvn --batch-mode --strict-checksums --errors clean verify site + + - name: Upload test logs + uses: actions/upload-artifact@v4 + if: always() + with: + name: test-logs + path: ./com.io7m.dixmont.tests/target/surefire-reports + + +