chore: squash #5 for testing

Signed-off-by: GitHub <[email protected]>
elide-dev · Jun 10, 2024 · c2d1976 · c2d1976
1 parent f52fd23
commit c2d1976
Show file tree

Hide file tree

Showing 12 changed files with 98 additions and 340 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -16,25 +16,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [8, 11, 17, 21, 23-ea]
-        os: [ubuntu-latest, macos-13, macos-latest]
-        exclude:
-          # 23-ea is not available for mac OS
-          - java: 23-ea
-            os: macos-latest
+        java: [8, 11, 17, 21]
+        os: [ubuntu-latest, macos-latest]
       # Run all tests even if one fails
       fail-fast: false
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
 
     steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: 'zulu'
@@ -48,14 +39,6 @@ jobs:
           brew install automake --force
           brew install libtool --force
           brew install texinfo --force
-      - name: Java Flags
-        run: |
-          # if java is greater than 17, we need to enable the security manager
-          if [ ${{ matrix.java }} -gt 17 ]; then
-            export ANT_OPTS="-Djava.security.manager=allow"
-            # enable for subsequent tasks
-            echo "ANT_OPTS=-Djava.security.manager=allow" >> $GITHUB_ENV
-          fi
       - name: Checkstyle
         if: contains(matrix.os, 'ubuntu') && contains(matrix.java, '8')
         run: |
@@ -65,25 +48,37 @@ jobs:
         run: |
           ant test
           ant test-platform
-      - name: Local Deploy
-        run: ant deploy-local
-      - uses: actions/upload-artifact@v4
-        with:
-          name: jna-maven-bundle-${{ matrix.os }}-jdk${{ matrix.java }}-${{ github.sha }}
-          path: build/stage
-          if-no-files-found: error
-          retention-days: 14
-          compression-level: 1
-          overwrite: true
 
-  # test-graalvm:
-  #   strategy:
-  #     matrix:
-  #       java: [21]
-  #       os: [ubuntu-latest]
-  #     fail-fast: true
-  #   name: GraalVM Native
-  #   uses: ./.github/workflows/graalvm.yaml
-  #   with:
-  #     runner: ${{ matrix.os }}
-  #     java: ${{ matrix.java }}
+  test-m1:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        java: [21]
+        # macos-14 is documented to run on m1
+        # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
+        os: [macos-14]
+      # Run all tests even if one fails
+      fail-fast: true
+    name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'zulu'
+      - name: Linux requirements
+        if: contains(matrix.os, 'ubuntu')
+        run: sudo apt-get -y install texinfo
+      - name: macOS requirements
+        if: contains(matrix.os, 'macos')
+        run: |
+          brew update
+          brew install automake --force
+          brew install libtool --force
+          brew install texinfo --force
+      - name: Run test
+        run: |
+          ant test
+          ant test-platform
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
diff --git a/.github/workflows/graalvm.workflow.yaml b/.github/workflows/graalvm.workflow.yaml
@@ -38,13 +38,8 @@ jobs:
     name: Test GVM ${{ inputs.java }}, ${{ inputs.runner }}
 
     steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
-      - uses: graalvm/setup-graalvm@2f25c0caae5b220866f732832d5e3e29ff493338 # v1.2.1
+      - uses: actions/checkout@v4
+      - uses: graalvm/setup-graalvm@v1
         with:
           java-version: '${{ inputs.java }}'
           distribution: 'graalvm-community'
@@ -59,6 +54,6 @@ jobs:
           brew install automake --force
           brew install libtool --force
           brew install texinfo --force
-      - uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
+      - uses: gradle/actions/setup-gradle@v3
       - name: "Build: Native Image"
         run: ant dist && ant install && ant nativeImage && ant nativeRun
diff --git a/.github/workflows/graalvm.yaml b/.github/workflows/graalvm.yaml
@@ -21,19 +21,14 @@ jobs:
     name: Test GVM 22, ubuntu-latest
 
     steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
-      - uses: graalvm/setup-graalvm@2f25c0caae5b220866f732832d5e3e29ff493338 # v1.2.1
+      - uses: actions/checkout@v4
+      - uses: graalvm/setup-graalvm@v1
         with:
           java-version: '22'
           distribution: 'graalvm-community'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Linux requirements
         run: sudo apt-get -y install texinfo
-      - uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
+      - uses: gradle/actions/setup-gradle@v3
       - name: "Build: Native Image"
         run: ant dist && ant install && ant nativeImage && ant nativeRun
diff --git a/.github/workflows/native-libraries-macOS.yaml b/.github/workflows/native-libraries-macOS.yaml
@@ -17,14 +17,9 @@ jobs:
     name: Build native libraries for mac OS / darwin
 
     steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
           distribution: 'zulu'
@@ -40,7 +35,7 @@ jobs:
           ant -Dos.prefix=darwin-aarch64
           ant -Dos.prefix=darwin-x86-64
       - name: Upload mac OS binaries
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+        uses: actions/upload-artifact@v4
         with:
           name: darwin-native
           path: |

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