Merge pull request #598 from hexagonkt/develop

Test
hexagontk · Jan 13, 2023 · 8643759 · 8643759
2 parents 8e2e43a + 1c609d3
commit 8643759
Show file tree

Hide file tree

Showing 19 changed files with 341 additions and 270 deletions.
diff --git a/.github/actions/gradle/action.yml b/.github/actions/gradle/action.yml
diff --git a/.github/actions/image_magick/action.yml b/.github/actions/image_magick/action.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,13 @@
+
+name: Build
+
+on:
+  push:
+
+jobs:
+  build:
+    name: Build
+    permissions: read-all
+    uses: hexagonkt/.github/.github/workflows/gradle.yml@master
+    with:
+      check_directory: core/build
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -7,86 +7,51 @@ on:
 
 jobs:
   build:
-    defaults:
-      run: { shell: bash }
     strategy:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
 
     name: Build (${{ matrix.os }})
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check Out
-        uses: actions/checkout@v3
-        with: { ref: develop }
-      - name: Build Project
-        uses: ./.github/actions/gradle
-      - name: Check Build
-        run: ls -AlF core/build
+    permissions: read-all
+    uses: hexagonkt/.github/.github/workflows/gradle.yml@master
+    with:
+      os: ${{ matrix.os }}
+      check_directory: core/build
+      ref: develop
 
   sample_keystores:
-    defaults:
-      run: { shell: bash }
     strategy:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
 
     name: Sample Keystores (${{ matrix.os }})
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check Out
-        uses: actions/checkout@v3
-        with: { ref: develop }
-      - name: Create Sample Keystores
-        uses: ./.github/actions/gradle
-        with:
-          tasks: createCa createIdentities
+    permissions: read-all
+    uses: hexagonkt/.github/.github/workflows/gradle.yml@master
+    with:
+      os: ${{ matrix.os }}
+      ref: develop
+      tasks: createCa createIdentities
 
   build_site:
     name: Build Site
-    runs-on: ubuntu-latest
-    steps:
-
-      # SET UP
-      - name: Check Out
-        uses: actions/checkout@v3
-        with: { ref: develop }
-      - name: Install ImageMagick
-        uses: ./.github/actions/image_magick
-      - name: Restore Cache
-        uses: actions/cache@v3
-        with:
-          key: ${{ runner.os }}-mkdocs-${{ hashFiles('**/*.gradle*', '**/gradle*.properties') }}
-          restore-keys: ${{ runner.os }}-mkdocs-
-          path: |
-            ~/.local/bin
-            ~/.local/lib/python*/site-packages
-
-      # PROCESS
-      - name: Build Project
-        uses: ./.github/actions/gradle
-      - name: Build Site
-        run: |
-          ./gradlew --info -x build buildSite
-          ls -AlF site/build/site
+    permissions: read-all
+    uses: hexagonkt/hexagon/.github/workflows/site.yml@master
+    with:
+      ref: develop
 
   test_publishing:
-    defaults:
-      run: { shell: bash }
     strategy:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
 
     name: Test Publishing (${{ matrix.os }})
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Check Out
-        uses: actions/checkout@v3
-        with: { ref: develop }
-      - name: Test Publishing
-        uses: ./.github/actions/gradle
-        with:
-          tasks: publishToMavenLocal -x test
+    permissions: read-all
+    uses: hexagonkt/.github/.github/workflows/gradle.yml@master
+    with:
+      os: ${{ matrix.os }}
+      ref: develop
+      check_directory: core/build
+      tasks: publishToMavenLocal -x test
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -7,49 +7,20 @@ on:
 jobs:
   sample_keystores:
     name: Sample Keystores
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check Out
-        uses: actions/checkout@v3
-      - name: Create Sample Keystores
-        uses: ./.github/actions/gradle
-        with:
-          tasks: createCa createIdentities
+    permissions: read-all
+    uses: hexagonkt/.github/.github/workflows/gradle.yml@master
+    with:
+      tasks: createCa createIdentities
 
   build_site:
     name: Build Site
-    runs-on: ubuntu-latest
-    steps:
-
-      # SET UP
-      - name: Check Out
-        uses: actions/checkout@v3
-      - name: Install ImageMagick
-        uses: ./.github/actions/image_magick
-      - name: Restore Cache
-        uses: actions/cache@v3
-        with:
-          key: ${{ runner.os }}-mkdocs-${{ hashFiles('**/*.gradle*', '**/gradle*.properties') }}
-          restore-keys: ${{ runner.os }}-mkdocs-
-          path: |
-            ~/.local/bin
-            ~/.local/lib/python*/site-packages
-
-      # PROCESS
-      - name: Build Project
-        uses: ./.github/actions/gradle
-      - name: Build Site
-        run: |
-          ./gradlew --info -x build buildSite
-          ls -AlF site/build/site
+    permissions: read-all
+    uses: hexagonkt/hexagon/.github/workflows/site.yml@develop
 
   test_publishing:
     name: Test Publishing
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check Out
-        uses: actions/checkout@v3
-      - name: Test Publishing
-        uses: ./.github/actions/gradle
-        with:
-          tasks: publishToMavenLocal -x test
+    permissions: read-all
+    uses: hexagonkt/.github/.github/workflows/gradle.yml@master
+    with:
+      check_directory: core/build
+      tasks: publishToMavenLocal -x test
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,29 +6,28 @@ on:
     branches: [ master ]
 
 jobs:
-  sample_keystores:
-    name: Sample Keystores
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check Out
-        uses: actions/checkout@v3
-      - name: Create Sample Keystores
-        uses: ./.github/actions/gradle
-        with:
-          tasks: createCa createIdentities
-
   publish:
     name: Publish
     runs-on: ubuntu-latest
-    needs: [ sample_keystores ]
     steps:
+      - name: Restore ImageMagick Cache
+        uses: actions/cache@v3
+        with:
+          key: ${{ runner.os }}-imagemagick-${{ hashFiles('assets/*.gradle*') }}
+          restore-keys: ${{ runner.os }}-imagemagick-
+          path: ~/.local/bin/magick
 
-      # SET UP
-      - name: Check Out
-        uses: actions/checkout@v3
       - name: Install ImageMagick
-        uses: ./.github/actions/image_magick
-      - name: Restore Cache
+        run: |
+          sudo apt-get install fuse
+          sudo apt-get install librsvg2-bin
+          mkdir -p ~/.local/bin
+          export MAGICK="https://download.imagemagick.org/ImageMagick/download/binaries/magick"
+          [[ ! -f ~/.local/bin/magick ]] && sudo curl "$MAGICK" -Lo ~/.local/bin/magick
+          sudo chmod +x ~/.local/bin/magick
+          magick --version
+
+      - name: Restore MkDocs Cache
         uses: actions/cache@v3
         with:
           key: ${{ runner.os }}-mkdocs-${{ hashFiles('**/*.gradle*', '**/gradle*.properties') }}
@@ -37,7 +36,11 @@ jobs:
             ~/.local/bin
             ~/.local/lib/python*/site-packages
 
-      # PROCESS
+      - name: Check Out
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Update Site
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml