Merge pull request gythialy#219 from gythialy/feature/osx-sdk-v13

feat: bump macOS sdk to v13

.github/workflows/builder.yml

@@ -5,13 +5,13 @@ on:
     inputs:
       builder-tag:
         description: golang cross builder tag name
-        default: v1.21.0-0
+        default: v1.21.0-1
       golang-version:
         description: golang version
         default: '1.21.0'
       osxcross-git-hash:
         description: git commit hash of osx-cross project
-        default: '50e86ebca7d14372febd0af8cd098705049161b9'
+        default: '3dcc13644cfaa3d7ea6a959acbe0f1a23cf2df72'
       osx-min-version:
         description: minimal macOS SDK deployment target
         default: '10.12'

.github/workflows/osx-sdk.yaml

@@ -11,7 +11,7 @@ jobs:
       packages: write
       contents: read
     env:
-      OSX_TAG: v13.1
+      OSX_TAG: v13
       DOCKER_REGISTRY: "ghcr.io"
     steps:
       # - name: Setup Xcode
@@ -37,6 +37,14 @@ jobs:
       - name: Get Repo Owner
         id: get_repo_owner
         run: echo "repo_owner=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/osx-sdk
+          tags: |
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=raw,value=${{ env.OSX_TAG }}
       - name: Login to GitHub Container Registry
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
@@ -51,6 +59,8 @@ jobs:
           context: .
           file: Dockerfile.osx_sdk
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ env.DOCKER_REGISTRY}}/${{ steps.get_repo_owner.outputs.repo_owner }}/osx-sdk:${{ env.OSX_TAG }}
+          platforms: linux/amd64,linux/arm64
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max

Dockerfile.builder

@@ -3,9 +3,9 @@ ARG GO_VERSION=1.21.0
 
 # osxcross parameters
 ARG OSX_VERSION_MIN=10.12
-ARG OSX_CROSS_COMMIT=50e86ebca7d14372febd0af8cd098705049161b9
+ARG OSX_CROSS_COMMIT=3dcc13644cfaa3d7ea6a959acbe0f1a23cf2df72
 
-FROM golang:${GO_VERSION:-1.20.5}-bullseye AS base
+FROM golang:${GO_VERSION:-1.21.0}-bullseye AS base
 
 ARG APT_MIRROR
 RUN sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \
@@ -72,10 +72,10 @@ RUN set -x; echo "Starting image build for Debian    " \
 WORKDIR "${OSX_CROSS_PATH}"
 # install osxcross:
 RUN git clone https://github.com/tpoechtrager/osxcross.git . \
- && git checkout -q "${OSX_CROSS_COMMIT:-50e86ebca7d14372febd0af8cd098705049161b9}"
+ && git checkout -q "${OSX_CROSS_COMMIT:-3dcc13644cfaa3d7ea6a959acbe0f1a23cf2df72}"
 
 # install osx sdk
-COPY --from=ghcr.io/gythialy/golang-cross/osx-sdk:macos-12.3@sha256:6fc96c49165b28ed79e4228bcf59a001232a8a8e6c1d942a592dfe6e33352640 "${OSX_CROSS_PATH}/." "${OSX_CROSS_PATH}/"
+COPY --from=ghcr.io/gythialy/osx-sdk:v13@sha256:c0654de9a559cf9852a40a925761882a9147dd0dd35f87eaba6a6edc6c5bde43 "${OSX_CROSS_PATH}/." "${OSX_CROSS_PATH}"
 
 # https://github.com/tpoechtrager/osxcross/issues/313
 COPY patch/osxcross-08-52-08.patch "${OSX_CROSS_PATH}/"

Dockerfile.osx_sdk

@@ -1,8 +1,7 @@
-FROM debian:bullseye-slim
+FROM debian:stable-slim
 
 ENV OSX_CROSS_PATH=/osxcross
 
 WORKDIR "${OSX_CROSS_PATH}"
 
-COPY "./*.tar.xz" "${OSX_CROSS_PATH}/"
-COPY ./sha256sum.txt "${OSX_CROSS_PATH}/"
+COPY "./MacOSX13.sdk.tar.xz" "${OSX_CROSS_PATH}/tarballs/"