Update build toolchain

gi0baro · Oct 29, 2021 · 09ccfa8 · 09ccfa8
1 parent e44b071
commit 09ccfa8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 19 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ on:
 jobs:
   Linux:
     runs-on: ubuntu-18.04
-    container: cr.amira.io/gi0baro/pyoxidizer/musl:d7ed2aa3
+    container: cr.amira.io/gi0baro/pyoxidizer/musl:0.18.0
 
     steps:
       - uses: actions/checkout@v2
@@ -39,7 +39,7 @@ jobs:
           path: dist/noir-${{ steps.build_version.outputs.version }}-x86_64-unknown-linux-musl.sha256sum
 
   MacOS:
-    runs-on: macos-10.15
+    runs-on: macos-11
 
     env:
       PYOXIDIZER_SYSTEM_RUST: "1"
@@ -52,7 +52,7 @@ jobs:
           echo ::set-output name=version::$(echo ${GITHUB_SHA} | cut -c1-8)
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.54.0
+          toolchain: 1.56.0
           default: true
           profile: minimal
       - name: Set up Python
@@ -61,7 +61,7 @@ jobs:
           python-version: 3.9
       - name: Install PyOxidizer
         run: |
-          pip install pyoxidizer==0.17.0
+          pip install pyoxidizer==0.18.0
       - name: Build release
         run: |
           make build_mac ARCH=x86_64-apple-darwin
@@ -93,7 +93,7 @@ jobs:
         echo ::set-output name=version::$(echo ${GITHUB_SHA} | cut -c1-8)
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.54.0
+        toolchain: 1.56.0
         default: true
         profile: minimal
     - name: Set up Python
@@ -102,7 +102,7 @@ jobs:
         python-version: 3.9
     - name: Install PyOxidizer
       run: |
-        pip install pyoxidizer==0.17.0
+        pip install pyoxidizer==0.18.0
     - name: Build release
       run: |
         make build_win

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   Linux:
     runs-on: ubuntu-18.04
-    container: cr.amira.io/gi0baro/pyoxidizer/musl:d7ed2aa3
+    container: cr.amira.io/gi0baro/pyoxidizer/musl:0.18.0
 
     steps:
       - uses: actions/checkout@v2
@@ -35,7 +35,7 @@ jobs:
           path: dist/noir-${{ steps.build_version.outputs.version }}-linux-x86_64.sha256sum
 
   MacOS:
-    runs-on: macos-10.15
+    runs-on: macos-11
 
     env:
       PYOXIDIZER_SYSTEM_RUST: "1"
@@ -48,7 +48,7 @@ jobs:
           echo ::set-output name=version::${GITHUB_REF#refs/tags/}
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.54.0
+          toolchain: 1.56.0
           default: true
           profile: minimal
       - name: Set up Python
@@ -57,7 +57,7 @@ jobs:
           python-version: 3.9
       - name: Install PyOxidizer
         run: |
-          pip install pyoxidizer==0.17.0
+          pip install pyoxidizer==0.18.0
       - name: Build release
         run: |
           make build_mac ARCH=x86_64-apple-darwin
@@ -91,7 +91,7 @@ jobs:
         echo ::set-output name=version::${GITHUB_REF#refs/tags/}
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.54.0
+        toolchain: 1.56.0
         default: true
         profile: minimal
     - name: Set up Python
@@ -100,7 +100,7 @@ jobs:
         python-version: 3.9
     - name: Install PyOxidizer
       run: |
-        pip install pyoxidizer==0.17.0
+        pip install pyoxidizer==0.18.0
     - name: Build release
       run: |
         make build_win

diff --git a/pyoxidizer.bzl b/pyoxidizer.bzl
@@ -1,10 +1,3 @@
-def make_dist():
-    if BUILD_TARGET_TRIPLE == "x86_64-unknown-linux-musl":
-        flavor = "standalone_static"
-    else:
-        flavor = "standalone"
-    return default_python_distribution(python_version="3.9", flavor=flavor)
-
 def make_exe():
     if BUILD_TARGET_TRIPLE == "x86_64-unknown-linux-musl":
         flavor = "standalone_static"