Merge pull request #54 from eed3si9n/wip/actions

Fix GitHub Actions
scalameta · Dec 22, 2022 · 44042e9 · 44042e9
2 parents 9cee2c1 + dbe4827
commit 44042e9
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
       - main
   pull_request:
 jobs:
-  unix:
+  native-image:
     name: Compile
     runs-on: ${{ matrix.os }}
     strategy:
@@ -15,10 +15,13 @@ jobs:
         os: [macOS-latest, ubuntu-latest, windows-latest]
         java: [8]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: olafurpg/setup-scala@v13
         with:
           java-version: "adopt@1.${{ matrix.java }}"
+      - name: Setup Windows C++ toolchain
+        uses: ilammy/msvc-dev-cmd@v1
+        if: ${{ matrix.os == 'windows-latest' }}
       - name: sbt test plugin/scripted
         if: ${{ matrix.os == 'ubuntu-latest' }}
         shell: bash
@@ -30,15 +33,13 @@ jobs:
           export NATIVE_IMAGE_COMMAND=$GRAALVM_HOME/bin/native-image
           sbt test plugin/scripted
       - name: sbt test
-        shell: cmd
+        shell: bash
         if: ${{ matrix.os == 'windows-latest' }}
-        run: >-
-          "C:\Program Files (x86)\Microsoft Visual
-          Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" && sbt
-          example/nativeImage
+        run: |
+          sbt example/nativeImage
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: olafurpg/setup-scala@v13
       - run: sbt checkAll
diff --git a/.github/workflows/native.yml b/.github/workflows/native.yml
@@ -8,7 +8,7 @@ on:
   release:
     types: [published]
 jobs:
-  unix:
+  native-image:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -25,22 +25,27 @@ jobs:
           - os: windows-latest
             uploaded_filename: example-x86_64-pc-win32.exe
             local_path: example\target\native-image\example.exe
+    env:
+      # define Java options for both official sbt and sbt-extras
+      JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
+      JVM_OPTS:  -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
     steps:
-      - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/checkout@v3
+      - name: Setup JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 8
+          cache: sbt
       - run: git fetch --tags || true
-      - run: sbt example/nativeImage
-        shell: bash
-        if: ${{ matrix.os != 'windows-latest' }}
-      - run: echo $(pwd)
-        shell: bash
-      - name: sbt test
-        shell: cmd
+      - name: Setup Windows C++ toolchain
+        uses: ilammy/msvc-dev-cmd@v1
         if: ${{ matrix.os == 'windows-latest' }}
-        run: >-
-          "C:\Program Files (x86)\Microsoft Visual
-          Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" && sbt
-          example/nativeImage
+      - name: Build
+        shell: bash
+        run: |
+          echo $(pwd)
+          sbt clean example/nativeImage
       - uses: actions/upload-artifact@v2
         with:
           path: ${{ matrix.local_path }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: olafurpg/setup-scala@v13
       - uses: olafurpg/setup-gpg@v3
       - run: git fetch --tags || true