Move to Big Sur as build environment

dehesselle · May 12, 2022 · 1d3ca6b · 1d3ca6b
1 parent 59bbabb
commit 1d3ca6b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/.github/workflows/build_toolset.yml b/.github/workflows/build_toolset.yml
@@ -29,7 +29,7 @@ jobs:
   ##############################################################################
 
   build_toolset:
-    runs-on: macos-10.15
+    runs-on: macos-11
     env:
       WRK_DIR: /Users/Shared/work
       CCACHE_DIR: /Users/Shared/work/ccache
@@ -57,14 +57,14 @@ jobs:
           key: ccache-toolset-${{ steps.cache_id.outputs.time }}
           restore-keys: ccache-toolset-
 
-      # GitHub does not provide 10.13 SDK on their runners and no image older
-      # than Catalina. See here for what you can expect in their Catalina image:
-      # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md
+      # GitHub does not provide 10.11 SDK on their runners and no image older
+      # than Catalina. See here for what you can expect in their images:
+      # https://github.com/actions/virtual-environments/tree/main/images/macos
       #
       # Official downloads from Apple are not accessible without a developer
       # account and I don't trust 3rd party sources (e.g. "phracker"). So I'm
       # using my own (non-public) source, but I'm providing the means to verify
-      # what I'm doing, see here:
+      # its genuinity, see here:
       # https://github.com/dehesselle/sdkchecksum
       #
       # In order to use your custom SDK_DOWNLOAD_URL, create a repository secret

diff --git a/.github/workflows/inkscape_only.yml b/.github/workflows/inkscape_only.yml
@@ -15,7 +15,7 @@ jobs:
 ################################################################################
 
   inkscape:
-    runs-on: macos-10.15
+    runs-on: macos-11
     env:
       WRK_DIR: /Users/Shared/work
       CCACHE_DIR: /Users/Shared/work/ccache

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
   ##############################################################################
 
   check_requirements:
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
 
       - name: checkout mibap repository
@@ -79,7 +79,7 @@ jobs:
   ##############################################################################
 
   create_release:
-    runs-on: macos-10.15
+    runs-on: macos-11
     needs: call_validate_toolset
     env:
       WRK_DIR: /Users/Shared/work

diff --git a/.github/workflows/validate_toolset.yml b/.github/workflows/validate_toolset.yml
@@ -29,7 +29,7 @@ jobs:
   ##############################################################################
 
   validate_toolset:
-    runs-on: macos-10.15
+    runs-on: macos-11
     env:
       WRK_DIR: ${{ inputs.WRK_DIR }}
       CCACHE_DIR: ${{ inputs.CCACHE_DIR }}

diff --git a/README.md b/README.md
@@ -23,8 +23,8 @@ The build system being used is [JHBuild](https://gitlab.gnome.org/GNOME/jhbuild)
 
 - There are __version recommendations__ based on known working setups.
   - For `x86_64` architecture:
-    - macOS Catalina 10.15.7
-    - Xcode 12.4
+    - macOS Big Sur 11.6.5
+    - Xcode 13.0
     - macOS High Sierra 10.13 SDK (from Xcode 9.4.1)
   - For `arm64` architecture:
     - macOS Big Sur 11.6.5

diff --git a/jhb b/jhb
diff --git a/jhb-custom.conf.sh b/jhb-custom.conf.sh
@@ -18,11 +18,10 @@
 
 ### variables ##################################################################
 
-VERSION=0.63
+VERSION=0.64
 VER_DIR_TEMPLATE="\$WRK_DIR/mibap-\$VERSION"
 
 RECOMMENDED_SDK_VER_X86_64=10.13
-RECOMMENDED_MACOS_VER_X86_64=10.15.7
 
 RELEASE_ARCHIVE=mibap-"$VERSION"_$(uname -m).dmg
 RELEASE_URL_TEMPLATE="https://github.com/dehesselle/mibap/releases/download/\
+4 −5		.github/workflows/build.yml
+2 −2		.github/workflows/release.yml
+73 −0		.gitlab-ci.yml
+1 −1		etc/jhb.conf/recommended.sh
+1 −1		etc/jhb.conf/version.sh