diff --git a/.github/actions/build-for-distribution/action.yml b/.github/actions/build-for-distribution/action.yml index d88ef34..e95026e 100644 --- a/.github/actions/build-for-distribution/action.yml +++ b/.github/actions/build-for-distribution/action.yml @@ -17,6 +17,7 @@ runs: using: "composite" steps: - name: Restore Workspace Dir + if: ${{ inputs.swift-workspace-cache != '' }} uses: actions/cache/restore@v4 with: key: ${{ inputs.swift-workspace-cache }} diff --git a/.github/actions/checkout-swift/action.yml b/.github/actions/checkout-swift/action.yml index 04fc0b4..5664d8f 100644 --- a/.github/actions/checkout-swift/action.yml +++ b/.github/actions/checkout-swift/action.yml @@ -10,14 +10,18 @@ inputs: runs: using: "composite" steps: - - name: Cache Workspace Dir - id: cache-workspace - uses: actions/cache@v4 + - name: Restore Workspace Dir + id: restore-workspace + uses: actions/cache/restore@v4 with: key: ${{ inputs.swift-workspace-cache }} path: downloads - lookup-only: true - - if: ${{ steps.cache-workspace.outputs.cache-hit != 'true' }} + - if: ${{ steps.restore-workspace.outputs.cache-hit != 'true' }} name: Checkout Sources shell: bash run: SWIFT_VERSION=${{ inputs.swift-tag }} ./fetch-sources.sh + - if: ${{ steps.restore-workspace.outputs.cache-hit != 'true' }} + uses: actions/cache/save@v4 + with: + key: ${{ inputs.swift-workspace-cache }} + path: downloads diff --git a/.github/workflows/build-swift-release.yml b/.github/workflows/build-swift-release.yml index 97355a8..8d446db 100644 --- a/.github/workflows/build-swift-release.yml +++ b/.github/workflows/build-swift-release.yml @@ -7,7 +7,7 @@ on: env: SWIFT_TAG: swift-${{ github.event.release.tag_name }}-RELEASE SWIFT_WORKSPACE_CACHE: swift-${{ github.event.release.tag_name }}-workspace - SWIFT_BUILDER_TAG: ${{ github.event.release.tag_name }}-gh-runner + SWIFT_BUILDER_TAG: 6.0.2-gh-runner jobs: fetch-sources: diff --git a/.github/workflows/build-swift-versions.yml b/.github/workflows/build-swift-versions.yml index 828def4..a1c6e4d 100644 --- a/.github/workflows/build-swift-versions.yml +++ b/.github/workflows/build-swift-versions.yml @@ -28,7 +28,6 @@ jobs: name: Build & Publish Swift with: swift-tag: ${{ env.SWIFT_TAG }} - swift-workspace-cache: ${{ env.SWIFT_WORKSPACE_CACHE }} distribution: ${{ env.DISTRIBUTION }} builder-tag: ${{ env.SWIFT_BUILDER_TAG }} @@ -50,16 +49,15 @@ jobs: name: Build & Publish Swift with: swift-tag: ${{ env.SWIFT_TAG }} - swift-workspace-cache: ${{ env.SWIFT_WORKSPACE_CACHE }} distribution: ${{ env.DISTRIBUTION }} builder-tag: ${{ env.SWIFT_BUILDER_TAG }} - swift-6-0-2: + swift-6-0-3: env: - SWIFT_TAG: swift-6.0.2-RELEASE - SWIFT_WORKSPACE_CACHE: swift-6.0.2-workspace + SWIFT_TAG: swift-6.0.3-RELEASE + SWIFT_WORKSPACE_CACHE: swift-6.0.3-workspace SWIFT_BUILDER_TAG: 6.0.2-gh-runner - name: Build Swift 6.0.2 + name: Build Swift 6.0.3 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -72,6 +70,5 @@ jobs: name: Build & Publish Swift with: swift-tag: ${{ env.SWIFT_TAG }} - swift-workspace-cache: ${{ env.SWIFT_WORKSPACE_CACHE }} distribution: ${{ env.DISTRIBUTION }} builder-tag: ${{ env.SWIFT_BUILDER_TAG }} diff --git a/swift-define b/swift-define index c5d06c9..9ae5478 100644 --- a/swift-define +++ b/swift-define @@ -1,5 +1,5 @@ # Version -SWIFT_VERSION=${SWIFT_VERSION:=swift-6.0.2-RELEASE} +SWIFT_VERSION=${SWIFT_VERSION:=swift-6.0.3-RELEASE} SWIFT_TARGET_ARCH=armv7 SWIFT_TARGET_NAME=armv7-unknown-linux-gnueabihf