You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bm...@apache.org on 2021/10/10 10:42:41 UTC

[shiro-site] branch jbake updated: add github action (fixed, git add).

This is an automated email from the ASF dual-hosted git repository.

bmarwell pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/shiro-site.git


The following commit(s) were added to refs/heads/jbake by this push:
     new 9e5fe37  add github action (fixed, git add).
     new f12a9a2  Merge pull request #114 from bmarwell/jbake
9e5fe37 is described below

commit 9e5fe377e2e97ffa4f35529620bce55eff4d32ed
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Sun Oct 10 12:38:17 2021 +0200

    add github action (fixed, git add).
---
 .github/workflows/maven.yml | 91 ++++-----------------------------------------
 1 file changed, 7 insertions(+), 84 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 63c0955..e0308ec 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -20,97 +20,20 @@ name: Maven CI
 on:
   workflow_dispatch: {}
   push:
-    branches: [ main ]
+    branches: [ main, jbake ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, jbake ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v2
 
-      - name: Set up JDK
-        uses: actions/setup-java@v2
+      - uses: actions/setup-java@v2
         with:
-          java-version: 8
-          distribution: adopt-hotspot
+          java-version: '11'
+          distribution: 'temurin'
 
-      - name: License Check
-        run: mvn apache-rat:check "-Drat.consoleOutput"
-
-      - name: Build with Maven
-        run: mvn verify --show-version --errors --batch-mode --no-transfer-progress -Pdocs
-
-  build-all:
-    needs: build
-
-    strategy:
-      matrix:
-        os: [ ubuntu-latest, windows-latest, macOS-latest ]
-        java:
-          #  8
-          - version: 8
-            dist: adopt-hotspot
-          - version: 8
-            dist: adopt-openj9
-          - version: 8
-            dist: zulu
-          # 11
-          - version: 11
-            dist: adopt-hotspot
-          - version: 11
-            dist: adopt-openj9
-          - version: 11
-            dist: zulu
-          # 17 (16 fallback)
-          - version: 17
-            dist: temurin
-          - version: 16
-            dist: adopt-openj9
-          - version: 17
-            dist: zulu
-        exclude:
-          # was already built
-          - os: ubuntu-latest
-            java:
-              version: 8
-              dist: adopt-hotspot
-          # exclude some builds, because MacOs builds have fewer resources available.
-          # excludes java 16 on macOS.
-          - os: macOS-latest
-            java:
-              version: 16
-          # exclude temurin on MacOS. zulu (also hotspot) and OpenJ9 are sufficient.
-          - os: macOS-latest
-            java:
-              dist: adopt-hotspot
-      fail-fast: false
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set up cache for ~./m2/repository
-        uses: actions/cache@v2.1.6
-        with:
-          path: |
-            ~/.m2/repository
-            !~/.m2/repository/org/apache/shiro
-          key: maven-${{ matrix.os }}-java${{ matrix.java }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            maven-${{ matrix.os }}-java${{ matrix.java }}-
-            maven-${{ matrix.os }}-
-
-      - name: Set up JDK
-        uses: actions/setup-java@v2
-        with:
-          java-version: ${{ matrix.java.version }}
-          distribution: ${{ matrix.java.dist }}
-
-      - name: Build with Maven
-        run: mvn verify --show-version --errors --batch-mode --no-transfer-progress -Pdocs
+      - run: cd jbake && mvn generate-resources --show-version --errors --batch-mode --no-transfer-progress