Bump dependencies and build toolchain

gi0baro · Apr 14, 2024 · 2bc42c6 · 2bc42c6
1 parent e3cfdab
commit 2bc42c6
Show file tree

Hide file tree

Showing 7 changed files with 323 additions and 256 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,71 +12,113 @@ on:
       - pyoxidizer.bzl
 
 jobs:
-  Linux:
-    runs-on: ubuntu-18.04
-    container: cr.amira.io/gi0baro/pyoxidizer/musl:0.23.0
+  Linux-x86:
+    runs-on: ubuntu-latest
+    container: ghcr.io/gi0baro/pyoxidizer:0.24.0-musl
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Get build version
-        id: build_version
-        run: |
-          echo ::set-output name=version::$(echo ${GITHUB_SHA} | cut -c1-8)
-      - name: Build release
-        run: |
-          make build_linux
-          build/x86_64-unknown-linux-musl/release/install/noir --version
-          make pack_linux BUILD_VERSION=${{ steps.build_version.outputs.version }}
-      - name: Upload release file
-        uses: actions/upload-artifact@v1
-        with:
-          name: noir-${{ steps.build_version.outputs.version }}-linux-x86_64.tar.gz
-          path: dist/noir-${{ steps.build_version.outputs.version }}-x86_64-unknown-linux-musl.tar.gz
-      - name: Upload checksum file
-        uses: actions/upload-artifact@v1
-        with:
-          name: noir-${{ steps.build_version.outputs.version }}-linux-x86_64.sha256sum
-          path: dist/noir-${{ steps.build_version.outputs.version }}-x86_64-unknown-linux-musl.sha256sum
+    - uses: actions/checkout@v4
+    - name: Get build version
+      id: build_version
+      run: |
+        echo ::set-output name=version::$(echo ${GITHUB_SHA} | cut -c1-8)
+    - name: Build release
+      run: |
+        make build_linux
+        make pack_linux BUILD_VERSION=${{ steps.build_version.outputs.version }}
+    - name: Upload release file
+      uses: actions/upload-artifact@v3
+      with:
+        name: noir-${{ steps.build_version.outputs.version }}-linux-x86_64.tar.gz
+        path: dist/noir-${{ steps.build_version.outputs.version }}-x86_64-unknown-linux-musl.tar.gz
+    - name: Upload checksum file
+      uses: actions/upload-artifact@v3
+      with:
+        name: noir-${{ steps.build_version.outputs.version }}-linux-x86_64.sha256sum
+        path: dist/noir-${{ steps.build_version.outputs.version }}-x86_64-unknown-linux-musl.sha256sum
+
+  # Linux-arm:
+  #   runs-on: ubuntu-latest
+
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #   - name: Get build version
+  #     id: build_version
+  #     run: |
+  #       echo ::set-output name=version::$(echo ${GITHUB_SHA} | cut -c1-8)
+  #   - uses: uraimo/run-on-arch-action@v2
+  #     name: Build release
+  #     with:
+  #       base_image: --platform=linux/arm64 ghcr.io/gi0baro/pyoxidizer:0.24.0-gnu
+  #       env: |
+  #         BUILD_VERSION: ${{ steps.build_version.outputs.version }}
+  #       run: |
+  #         make build_linux ARCH=aarch64-unknown-linux-gnu
+  #         make pack_linux ARCH=aarch64-unknown-linux-gnu BUILD_VERSION=$BUILD_VERSION
+
+  #   - name: Upload release file
+  #     uses: actions/upload-artifact@v3
+  #     with:
+  #       name: noir-${{ steps.build_version.outputs.version }}-linux-aarch64.tar.gz
+  #       path: dist/noir-${{ steps.build_version.outputs.version }}-aarch64-unknown-linux-gnu.tar.gz
+  #   - name: Upload checksum file
+  #     uses: actions/upload-artifact@v3
+  #     with:
+  #       name: noir-${{ steps.build_version.outputs.version }}-linux-aarch64.sha256sum
+  #       path: dist/noir-${{ steps.build_version.outputs.version }}-aarch64-unknown-linux-gnu.sha256sum
 
   MacOS:
-    runs-on: macos-11
+    runs-on: macos-14
 
     env:
       PYOXIDIZER_SYSTEM_RUST: "1"
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Get build version
-        id: build_version
-        run: |
-          echo ::set-output name=version::$(echo ${GITHUB_SHA} | cut -c1-8)
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: "1.65"
-          default: true
-          profile: minimal
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.10'
-      - name: Install PyOxidizer
-        run: |
-          pip install pyoxidizer==0.23.0
-      - name: Build release
-        run: |
-          make build_mac ARCH=x86_64-apple-darwin
-          build/x86_64-apple-darwin/release/install/noir --version
-          make pack_mac ARCH=x86_64-apple-darwin BUILD_VERSION=${{ steps.build_version.outputs.version }}
-      - name: Upload release file
-        uses: actions/upload-artifact@v1
-        with:
-          name: noir-${{ steps.build_version.outputs.version }}-darwin-x86_64.tar.gz
-          path: dist/noir-${{ steps.build_version.outputs.version }}-x86_64-apple-darwin.tar.gz
-      - name: Upload checksum file
-        uses: actions/upload-artifact@v1
-        with:
-          name: noir-${{ steps.build_version.outputs.version }}-darwin-x86_64.sha256sum
-          path: dist/noir-${{ steps.build_version.outputs.version }}-x86_64-apple-darwin.sha256sum
+    - uses: actions/checkout@v4
+    - name: Get build version
+      id: build_version
+      run: |
+        echo ::set-output name=version::$(echo ${GITHUB_SHA} | cut -c1-8)
+    - uses: actions-rs/toolchain@v1
+      with:
+        toolchain: "1.66"
+        default: true
+        profile: minimal
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.10"
+    - name: Install PyOxidizer
+      run: |
+        pip install pyoxidizer==0.24.0
+    # - name: Build x86_64 release
+    #   run: |
+    #     make build_mac ARCH=x86_64-apple-darwin
+    #     make pack_mac ARCH=x86_64-apple-darwin BUILD_VERSION=${{ steps.build_version.outputs.version }}
+    - name: Build aarch64 release
+      run: |
+        make build_mac ARCH=aarch64-apple-darwin
+        make pack_mac ARCH=aarch64-apple-darwin BUILD_VERSION=${{ steps.build_version.outputs.version }}
+    # - name: Upload x86_64 release file
+    #   uses: actions/upload-artifact@v3
+    #   with:
+    #     name: noir-${{ steps.build_version.outputs.version }}-darwin-x86_64.tar.gz
+    #     path: dist/noir-${{ steps.build_version.outputs.version }}-x86_64-apple-darwin.tar.gz
+    # - name: Upload x86_64 checksum file
+    #   uses: actions/upload-artifact@v3
+    #   with:
+    #     name: noir-${{ steps.build_version.outputs.version }}-darwin-x86_64.sha256sum
+    #     path: dist/noir-${{ steps.build_version.outputs.version }}-x86_64-apple-darwin.sha256sum
+    - name: Upload aarch64 release file
+      uses: actions/upload-artifact@v3
+      with:
+        name: noir-${{ steps.build_version.outputs.version }}-darwin-aarch64.tar.gz
+        path: dist/noir-${{ steps.build_version.outputs.version }}-aarch64-apple-darwin.tar.gz
+    - name: Upload aarch64 checksum file
+      uses: actions/upload-artifact@v3
+      with:
+        name: noir-${{ steps.build_version.outputs.version }}-darwin-aarch64.sha256sum
+        path: dist/noir-${{ steps.build_version.outputs.version }}-aarch64-apple-darwin.sha256sum
 
   Windows:
     runs-on: windows-2019
@@ -85,36 +127,36 @@ jobs:
       PYOXIDIZER_SYSTEM_RUST: "1"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Get build version
       id: build_version
       shell: bash
       run: |
         echo ::set-output name=version::$(echo ${GITHUB_SHA} | cut -c1-8)
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: "1.65"
+        toolchain: "1.66"
         default: true
         profile: minimal
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: "3.10"
     - name: Install PyOxidizer
       run: |
-        pip install pyoxidizer==0.23.0
-    - name: Build release
+        pip install pyoxidizer==0.24.0
+    - name: Build x86_64 release
+      shell: bash
       run: |
         make build_win
-        build/x86_64-pc-windows-msvc/release/install/noir --version
         make pack_win BUILD_VERSION=${{ steps.build_version.outputs.version }}
-    - name: Upload release file
-      uses: actions/upload-artifact@v1
+    - name: Upload x86_64 release file
+      uses: actions/upload-artifact@v3
       with:
         name: noir-${{ steps.build_version.outputs.version }}-windows-x86_64.tar.gz
         path: dist/noir-${{ steps.build_version.outputs.version }}-x86_64-pc-windows-msvc.tar.gz
-    - name: Upload checksum file
-      uses: actions/upload-artifact@v1
+    - name: Upload x86_64 checksum file
+      uses: actions/upload-artifact@v3
       with:
         name: noir-${{ steps.build_version.outputs.version }}-windows-x86_64.sha256sum
         path: dist/noir-${{ steps.build_version.outputs.version }}-x86_64-pc-windows-msvc.sha256sum