Merge pull request #15 from sbt/wip/actions

Update actions
sbt · Oct 19, 2024 · 581b6c7 · 581b6c7
2 parents d7a094a + bf98692
commit 581b6c7
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 33 deletions.
diff --git a/.github/workflows/native.yml b/.github/workflows/native.yml
@@ -13,10 +13,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-latest
             uploaded_filename: sbtn-x86_64-pc-linux
             local_path: client/target/bin/sbtn
-          - os: windows-2019
+          - os: windows-latest
             uploaded_filename: sbtn-x86_64-pc-win32.exe
             local_path: client\target\bin\sbtn.exe
     env:
@@ -33,15 +33,19 @@ jobs:
         with:
           distribution: temurin
           java-version: 8
+          # cache: sbt
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
       - run: git fetch --tags || true
       - name: Setup Windows C++ toolchain
         uses: ilammy/msvc-dev-cmd@v1
-        if: ${{ matrix.os == 'windows-2019' }}
+        if: ${{ matrix.os == 'windows-latest' }}
       - name: Build
         shell: bash
         run: |
           echo $(pwd)
-          sbt clean nativeImage
+          mkdir -p client/target/bin/
+          sbt nativeImage
       - uses: actions/upload-artifact@v4
         with:
           path: ${{ matrix.local_path }}
@@ -83,17 +87,16 @@ jobs:
         with:
           distribution: temurin
           java-version: 17
-
+          # cache: sbt
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
       - run: git fetch --tags || true
 
       - name: Build
         shell: bash
         run: |
-          mkdir -p "$HOME/bin/"
-          curl -sL https://raw.githubusercontent.com/sbt/sbt/v1.9.9/sbt > "$HOME/bin/sbt"
-          export PATH="$PATH:$HOME/bin"
-          chmod +x "$HOME/bin/sbt"
-          sbt clean nativeImage
+          mkdir -p client/target/bin/
+          sbt nativeImage
 
       - uses: actions/upload-artifact@v4
         with:
@@ -143,7 +146,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             uploaded_filename: sbtn-aarch64-pc-linux
             local_path: client/target/bin/sbtn
     env:
@@ -159,11 +162,15 @@ jobs:
         with:
           distribution: temurin
           java-version: 8
+          # cache: sbt
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
       - name: Build Linux aarch64
         uses: uraimo/run-on-arch-action@v2
         with:
-          arch: aarch64
-          distro: ubuntu20.04
+          arch: none
+          distro: none
+          base_image: '--platform=linux/aarch64 ubuntu:20.04'
 
           # Speeds up builds per the run-on-arch-action README
           githubToken: ${{ github.token }}
@@ -175,12 +182,15 @@ jobs:
           install: |
             apt-get update -q -y
             apt-get install -q -y curl openjdk-8-jdk build-essential libz-dev
+            # Install sbt inside the docker image
             mkdir -p "$HOME/bin/"
             curl -sL https://raw.githubusercontent.com/sbt/sbt/v1.9.9/sbt > "$HOME/bin/sbt"
             chmod +x "$HOME/bin/sbt"
           run: |
+            # Use sbt inside the Docker image
             export PATH="$PATH:$HOME/bin"
-            sbt clean nativeImage
+            mkdir -p client/target/bin/
+            sbt nativeImage
       - uses: actions/upload-artifact@v4
         with:
           path: ${{ matrix.local_path }}

diff --git a/post-tag.sh b/post-tag.sh
@@ -1,16 +1,14 @@
 #!/bin/bash -e
 
-VER=1.8.1-M1
+VER=1.10.0
 
 rm -rf target || true
 mkdir -p target
 mkdir -p target/temp
 
 BASE_URL=https://github.com/sbt/sbtn-dist/releases/download/v${VER}
 
-MAC_X86_64_URL=$BASE_URL/sbtn-x86_64-apple-darwin
-
-MAC_AARCH64_URL=$BASE_URL/sbtn-aarch64-apple-darwin
+MAC_URL=$BASE_URL/sbtn-universal-apple-darwin
 
 WINDOWS_URL=$BASE_URL/sbtn-x86_64-pc-win32.exe
 
@@ -22,33 +20,24 @@ LINUX_AARCH64_URL=$BASE_URL/sbtn-aarch64-pc-linux
 # mkdir sbtn
 # cd sbtn
 
-mkdir -p target/x86_64-apple-darwin
-mkdir -p target/aarch64-apple-darwin
+mkdir -p target/universal-apple-darwin
 mkdir -p target/x86_64-pc-linux
 mkdir -p target/aarch64-pc-linux
 mkdir -p target/x86_64-pc-win32
 
-curl -L $MAC_X86_64_URL > target/x86_64-apple-darwin/sbtn
-curl -L $MAC_AARCH64_URL > target/aarch64-apple-darwin/sbtn
+curl -L $MAC_URL > target/universal-apple-darwin/sbtn
 curl -L $LINUX_X86_64_URL > target/x86_64-pc-linux/sbtn
 curl -L $LINUX_AARCH64_URL > target/aarch64-pc-linux/sbtn
 curl -L $WINDOWS_URL > target/x86_64-pc-win32/sbtn.exe
 
 cd target
 
-cd x86_64-apple-darwin
-chmod +x sbtn
-tar czvf sbtn-x86_64-apple-darwin-$VER.tar.gz sbtn
-mv sbtn-x86_64-apple-darwin-$VER.tar.gz ../
-cd ../
-gpg -u 0x642ac823 --detach-sign --armor sbtn-x86_64-apple-darwin-$VER.tar.gz
-
-cd aarch64-apple-darwin
+cd universal-apple-darwin
 chmod +x sbtn
-tar czvf sbtn-aarch64-apple-darwin-$VER.tar.gz sbtn
-mv sbtn-aarch64-apple-darwin-$VER.tar.gz ../
+tar czvf sbtn-universal-apple-darwin-$VER.tar.gz sbtn
+mv sbtn-universal-apple-darwin-$VER.tar.gz ../
 cd ../
-gpg -u 0x642ac823 --detach-sign --armor sbtn-aarch64-apple-darwin-$VER.tar.gz
+gpg -u 0x642ac823 --detach-sign --armor sbtn-universal-apple-darwin-$VER.tar.gz
 
 cd x86_64-pc-linux
 chmod +x sbtn