Merge pull request #265 from gythialy/feature/golang-1.22.1

feat: bump golang version to v1.22.1
gythialy · Mar 7, 2024 · 4d5cf20 · 4d5cf20
2 parents 4dbb453 + 1baff83
commit 4d5cf20
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 20 deletions.
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
@@ -5,10 +5,10 @@ on:
     inputs:
       builder-tag:
         description: golang cross builder tag name
-        default: v1.22.0-0
+        default: v1.22.1-0
       golang-version:
         description: golang version
-        default: "1.22.0"
+        default: "1.22.1"
       osxcross-git-hash:
         description: git commit hash of osx-cross project
         default: "ff8d100f3f026b4ffbe4ce96d8aac4ce06f1278b"
@@ -21,7 +21,7 @@ jobs:
       matrix:
         codename: [bullseye, bookworm]
     runs-on: ubuntu-latest
-    continue-on-error: true
+    continue-on-error: false
     permissions:
       id-token: write
       packages: write
@@ -44,7 +44,7 @@ jobs:
         with:
           images: ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/golang-cross-builder
           tags: |
-            type=raw,value=latest,enable={{is_default_branch}}
+            type=raw,value=latest,enable=${{ matrix.codename == 'bookwarm' && github.ref == format('refs/heads/{0}', 'main') }}
             type=raw,value=${{ env.GOLANG_CROSS_TAG }}
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3

diff --git a/.github/workflows/cron.yaml b/.github/workflows/cron.yaml
@@ -3,21 +3,28 @@ name: Update depdencies
 on:
   workflow_dispatch:
   schedule:
-    - cron: '13 16 * * *'
+    - cron: "13 16 * * *"
 
 jobs:
-  build:
+  check-update:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repo
         uses: actions/checkout@v4
       - name: Check for update
         run: |
           bash scripts/check-update.sh
-      - name: Commit and push if changed
-        run: |-
-          git remote set-url origin https://${GITHUB_TOKEN}@github.com/gythialy/golang-cross.git
           git config --global user.email "gythialy.koo+github@gmail.com"
           git config --global user.name "Commiter Bot"
           git commit -a -m "🤖 Updated depdencies $(date +"%Y-%m-%d")" || exit 0
-          git push
+      - name: Create Pull Request
+        id: cpr
+        uses: peter-evans/create-pull-request@v6
+        with:
+          branch-suffix: random
+          assignees: gythialy
+      - name: Check outputs
+        if: ${{ steps.cpr.outputs.pull-request-number }}
+        run: |
+          echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
+          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
diff --git a/.github/workflows/release-golang-cross.yml b/.github/workflows/release-golang-cross.yml
@@ -30,13 +30,13 @@ jobs:
         with:
           images: ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/golang-cross
           tags: |
-            type=raw,value=latest,enable={{#if is_default_branch}}${{matrix.codename == 'bookwarm'}}{{else}}false{{/if}}
-            type=semver,pattern={{raw}},enable=${{matrix.codename == 'bookwarm'}}
-            type=semver,pattern={{version}},enable=${{matrix.codename == 'bookwarm'}}
-            type=semver,pattern={{major}}.{{minor}},enable=${{matrix.codename == 'bookwarm'}}
-            type=semver,pattern={{major}},enable=${{matrix.codename == 'bookwarm'}}
-            type=semver,pattern={{raw}},enable=${{matrix.codename != 'bookwarm'}},suffix=-${{matrix.codename}}
-            type=semver,pattern={{version}},enable=${{matrix.codename != 'bookwarm'}},suffix=-${{matrix.codename}}
+            type=raw,value=latest,enable=${{ matrix.codename == 'bookwarm' && github.ref == format('refs/heads/{0}', 'main') }}
+            type=semver,pattern={{raw}},enable=${{ matrix.codename == 'bookwarm' }}
+            type=semver,pattern={{version}},enable=${{ matrix.codename == 'bookwarm' }}
+            type=semver,pattern={{major}}.{{minor}},enable=${{ matrix.codename == 'bookwarm' }}
+            type=semver,pattern={{major}},enable=${{ matrix.codename == 'bookwarm' }}
+            type=semver,pattern={{raw}},enable=${{ matrix.codename != 'bookwarm' }},suffix=-${{ matrix.codename }}
+            type=semver,pattern={{version}},enable=${{ matrix.codename != 'bookwarm' }},suffix=-${{ matrix.codename }}
       - name: Login to GitHub Container Registry
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v3

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 ARG OS_CODENAME=bookworm
 
-FROM ghcr.io/gythialy/golang-cross-builder:v1.22.0-0-${OS_CODENAME:-bookworm}
+FROM ghcr.io/gythialy/golang-cross-builder:v1.22.1-0-${OS_CODENAME:-bookworm}
 
 LABEL maintainer="Goren G<gythialy.koo+github@gmail.com>"
 LABEL org.opencontainers.image.source https://github.com/gythialy/golang-cross

diff --git a/Dockerfile.builder b/Dockerfile.builder
@@ -1,11 +1,11 @@
 # golang parameters
-ARG GO_VERSION=1.22.0
+ARG GO_VERSION=1.22.1
 ARG OS_CODENAME=bookworm
 ARG OSK_SDK=macos-13
 
 FROM ghcr.io/gythialy/osx-sdk:${OSK_SDK:-macos-13} AS osx-sdk
 
-FROM golang:${GO_VERSION:-1.22.0}-${OS_CODENAME:-bookworm} AS base
+FROM golang:${GO_VERSION:-1.22.1}-${OS_CODENAME:-bookworm} AS base
 
 # osxcross parameters
 ARG OSX_VERSION_MIN=10.13