Skip to content

Update to Swift 6.2 #195

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

Merged
dkovba merged 12 commits into from
Jun 14, 2025
Merged

Update to Swift 6.2 #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8eb8eba
Use the correct Swift in the script
dkovba Jun 13, 2025
33ebb9d
Improve formatting
dkovba Jun 13, 2025
c0b4b84
Update to Swift 6.2 in `Package.swift`
dkovba Jun 13, 2025
e10e798
Update dependencies
dkovba Jun 13, 2025
6ba7fec
Update to Xcode-beta in CI
dkovba Jun 13, 2025
39d5fe5
Merge commit '24730167da7aa638430a7e57e8d6b39d895d33f8' into swift-6.2
dkovba Jun 13, 2025
d0c49a6
Remove the step that tries to update containerization
dkovba Jun 13, 2025
8293f8e
Add `DEVELOPER_DIR` to the "Check protobuf" step
dkovba Jun 13, 2025
bbd8ebf
Merge branch 'main' into swift-6.2
dkovba Jun 13, 2025
2a55fd7
Update a timeout
dkovba Jun 13, 2025
78aa2e9
Merge branch 'swift-6.2' of github.com:dkovba/container into swift-6.2
dkovba Jun 13, 2025
c9b8b5d
Merge branch 'main' into swift-6.2
dkovba Jun 14, 2025
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
14 changes: 6 additions & 8 deletions .github/workflows/common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
buildAndTest:
name: Build and test the project
timeout-minutes: 30
timeout-minutes: 60
runs-on: [self-hosted, macos, sequoia, ARM64]
permissions:
contents: read
Expand All @@ -24,10 +24,6 @@ jobs:
with:
fetch-depth: 0

- name: Update containerization
run: |
/usr/bin/swift package update containerization

- name: Check formatting
run: |
./scripts/install-hawkeye.sh
Expand All @@ -47,7 +43,9 @@ jobs:
git diff --name-only -- .
false
fi

env:
DEVELOPER_DIR: "/Applications/Xcode_26.b1.app/Contents/Developer"

- name: Set build configuration
run: |
echo "BUILD_CONFIGURATION=debug" >> $GITHUB_ENV
Expand All @@ -60,7 +58,7 @@ jobs:
make container dsym docs
tar cfz _site.tgz _site
env:
DEVELOPER_DIR: "/Applications/Xcode_16.3.app/Contents/Developer"
DEVELOPER_DIR: "/Applications/Xcode_26.b1.app/Contents/Developer"

- name: Create package
run: |
Expand All @@ -73,7 +71,7 @@ jobs:
launchctl setenv HTTP_PROXY $HTTP_PROXY
make test cleancontent install-kernel integration
env:
DEVELOPER_DIR: "/Applications/Xcode_16.3.app/Contents/Developer"
DEVELOPER_DIR: "/Applications/Xcode_26.b1.app/Contents/Developer"
CURRENT_SDK: y # explicitly repeated due to local env block

- name: Save documentation artifact
Expand Down
6 changes: 3 additions & 3 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 6.0
// swift-tools-version: 6.2
//===----------------------------------------------------------------------===//
// Copyright © 2025 Apple Inc. and the container project authors. All rights reserved.
//
Expand Down
10 changes: 5 additions & 5 deletions scripts/install-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.

SWIFT="/usr/bin/swift"
IMAGE_NAME="vminit:latest"
DESTDIR="${1:-$(git rev-parse --show-toplevel)/bin}"
mkdir -p "${DESTDIR}"

IMAGE_NAME="vminit:latest"

CONTAINERIZATION_VERSION="${CONTAINERIZATION_VERSION:-$(swift package show-dependencies --format json | jq -r '.dependencies[] | select(.identity == "containerization") | .version')}"
CONTAINERIZATION_VERSION="${CONTAINERIZATION_VERSION:-$(${SWIFT} package show-dependencies --format json | jq -r '.dependencies[] | select(.identity == "containerization") | .version')}"
if [ ! -z "${CONTAINERIZATION_PATH}" -o "${CONTAINERIZATION_VERSION}" == "unspecified" ] ; then
CONTAINERIZATION_PATH="${CONTAINERIZATION_PATH:-$(swift package show-dependencies --format json | jq -r '.dependencies[] | select(.identity == "containerization") | .path')}"
CONTAINERIZATION_PATH="${CONTAINERIZATION_PATH:-$(${SWIFT} package show-dependencies --format json | jq -r '.dependencies[] | select(.identity == "containerization") | .path')}"
echo "Creating InitImage"
make -C ${CONTAINERIZATION_PATH} init
${CONTAINERIZATION_PATH}/bin/cctl images save -o /tmp/init.tar ${IMAGE_NAME}
# sleep because commands after stop and start are racy
# Sleep because commands after stop and start are racy.
bin/container system stop && sleep 3 && bin/container system start && sleep 3
bin/container i load -i /tmp/init.tar
rm /tmp/init.tar
Expand Down