Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SWIFT_VERSION and workflows to 6.0.3 #17

Merged
merged 3 commits into from
Dec 16, 2024
Merged

Update SWIFT_VERSION and workflows to 6.0.3 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
841f658
Update SWIFT_VERSION and workflows to 6.0.3
xtremekforever Dec 13, 2024
1ee6f22
Try disabling workspace cache for building Swift versions
xtremekforever Dec 13, 2024
9702af5
Fixup checkout-swift to properly restore and save
xtremekforever Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/actions/build-for-distribution/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
14 changes: 9 additions & 5 deletions .github/actions/checkout-swift/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/build-swift-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/build-swift-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand All @@ -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
Expand All @@ -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 }}
2 changes: 1 addition & 1 deletion swift-define
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Loading