Skip to content

Commit f4858a1

Browse files
authored
Merge branch 'main' into gsoc-2025-post-4-testing-output
2 parents 1df0ace + 3d83a68 commit f4858a1

40 files changed

+554
-25
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.7
1+
3.3.9

Makefile

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Makefile for managing the Swift website with container
2+
3+
# Define the container runtime. Default to `container`.
4+
# Can be overridden from the command line, e.g., `make CONTAINER=docker website`
5+
CONTAINER ?= container
6+
7+
.PHONY: help build run-build website stop clean
8+
9+
help:
10+
@echo "Usage:"
11+
@echo " make build Build the swift-website-builder container image"
12+
@echo " make run-build Build the Jekyll website"
13+
@echo " make website Run the Jekyll development server"
14+
@echo " make stop Stop the running website container"
15+
@echo " make clean Stop the container and remove the build output"
16+
@echo ""
17+
@echo "To use a different container runtime (e.g. podman), run:"
18+
@echo " make CONTAINER=podman build"
19+
20+
# Build the primary container image
21+
build:
22+
$(CONTAINER) build --tag swift-website-builder --file Dockerfile .
23+
24+
# Run a one-off Jekyll build
25+
run-build:
26+
@mkdir -p ./.output
27+
$(CONTAINER) run --rm \
28+
-v "$(CURDIR)":/srv/jekyll \
29+
-v "$(CURDIR)/.output":/output \
30+
swift-website-builder \
31+
/bin/bash -cl "bundle check && bundle exec jekyll build --source /srv/jekyll --destination /output"
32+
33+
# Run the development web server
34+
website:
35+
@mkdir -p ./.output
36+
$(CONTAINER) run -d --rm --name swift-website \
37+
-p 4000:4000 \
38+
-v "$(CURDIR)":/srv/jekyll \
39+
-v "$(CURDIR)/.output":/output \
40+
swift-website-builder \
41+
/bin/bash -cl "bundle check && bundle exec jekyll serve --source /srv/jekyll --destination /output --host 0.0.0.0 --watch"
42+
@echo "Website is running at http://localhost:4000"
43+
44+
# Stop the development server
45+
stop:
46+
$(CONTAINER) stop swift-website
47+
48+
# Clean up build artifacts
49+
clean: stop
50+
@echo "Removing .output directory..."
51+
@rm -rf ./.output

README.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,26 @@ npm install
4848
npm run prettify
4949
```
5050

51+
### Running with Apple Container
52+
53+
On macOS 26 and later, you can use the [Apple Container](https://github.com/apple/container) tool to host and run the website.
54+
55+
First install and run `container`:
56+
57+
```shell
58+
brew install container
59+
brew services start container
60+
```
61+
62+
Then build and run the site:
63+
64+
```shell
65+
make build
66+
make website
67+
```
68+
69+
The website will be available at `http://localhost:4000`
70+
5171
### Running in Docker
5272

5373
First build the site with Docker Compose:

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ url: https://swift.org
22
title: Swift.org
33
description: "Swift is a general-purpose programming language built using a modern approach to safety, performance, and software design patterns."
44
timezone: America/Lower_Princes
5-
exclude: ["README.md", "config.ru", "Gemfile", "Gemfile.lock", "Procfile", "vendor", "get-started/storybook"]
5+
exclude: ["README.md", "config.ru", "Gemfile", "Gemfile.lock", "Procfile", "vendor", "get-started/storybook", "Makefile"]
66
safe: false
77
future: true
88

_data/authors.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ ktoso:
202202
203203
github: ktoso
204204
gravatar: 03cb20b97f6a14701c24c4e088b6af87
205-
about: "Konrad Malawski is a member of a team developing foundational server-side Swift libraries at Apple, with focus on distributed systems and concurrency."
205+
about: "Konrad is part of the Swift language team and Swift on Server Workgroup, where he works on language and runtime features with particular interest in supporting server and distributed computing use-cases, and expanding the Swift ecosystem."
206206

207207
compnerd:
208208
name: Saleem Abdulrasool
@@ -373,7 +373,7 @@ FranzBusch:
373373
374374
github: FranzBusch
375375
gravatar: 3b34dbe9f3870b0e9bf1f4cb0750fa3d
376-
about: "Franz Busch is a member of a team developing foundational server-side Swift libraries at Apple, and is a member of the SSWG."
376+
about: "Franz Busch is a member of the Ecosystem Steering Group and the Swift Server Workgroup. He works in a team developing foundational server-side Swift libraries at Apple."
377377

378378
adrian-prantl:
379379
name: Adrian Prantl
@@ -572,6 +572,18 @@ stmontgomery:
572572
github: stmontgomery
573573
about: "Stuart is a member of the Testing Workgroup and manages the Swift Testing Frameworks team at Apple."
574574

575+
ahmedelrefaey:
576+
name: Ahmed Elrefaey
577+
578+
github: a7medev
579+
about: "Ahmed is a software developer at Luciq. During Google Summer of Code 2025, he worked on improving the display of Swift documentation during code completion in SourceKit-LSP and VS Code."
580+
581+
mads:
582+
name: Mads Odgaard
583+
584+
github: madsodgaard
585+
about: "Mads is a Tech Lead at Frameo. During Google Summer of Code 2025, he worked on bringing JNI support to the jextract tool which is part of the Swift Java interoperability project."
586+
575587
priyambada:
576588
name: Priyambada Roul
577589

_data/builds/swift-6_2-branch/amazonlinux2-aarch64.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
- date: 2025-11-05 10:10:00-06:00
2+
dir: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-05-a
3+
download: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-05-a-amazonlinux2-aarch64.tar.gz
4+
download_signature: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-05-a-amazonlinux2-aarch64.tar.gz.sig
5+
name: Swift Development Snapshot
6+
- date: 2025-11-04 10:10:00-06:00
7+
dir: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-04-a
8+
download: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-04-a-amazonlinux2-aarch64.tar.gz
9+
download_signature: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-04-a-amazonlinux2-aarch64.tar.gz.sig
10+
name: Swift Development Snapshot
111
- date: 2025-11-03 10:10:00-06:00
212
dir: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-03-a
313
download: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-03-a-amazonlinux2-aarch64.tar.gz

_data/builds/swift-6_2-branch/amazonlinux2.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
- date: 2025-11-05 10:10:00-06:00
2+
dir: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-05-a
3+
download: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-05-a-amazonlinux2.tar.gz
4+
download_signature: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-05-a-amazonlinux2.tar.gz.sig
5+
name: Swift Development Snapshot
6+
- date: 2025-11-04 10:10:00-06:00
7+
dir: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-04-a
8+
download: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-04-a-amazonlinux2.tar.gz
9+
download_signature: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-04-a-amazonlinux2.tar.gz.sig
10+
name: Swift Development Snapshot
111
- date: 2025-11-03 10:10:00-06:00
212
dir: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-03-a
313
download: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-03-a-amazonlinux2.tar.gz

_data/builds/swift-6_2-branch/debian12-aarch64.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
- date: 2025-11-05 10:10:00-06:00
2+
dir: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-05-a
3+
download: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-05-a-debian12-aarch64.tar.gz
4+
download_signature: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-05-a-debian12-aarch64.tar.gz.sig
5+
name: Swift Development Snapshot
6+
- date: 2025-11-04 10:10:00-06:00
7+
dir: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-04-a
8+
download: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-04-a-debian12-aarch64.tar.gz
9+
download_signature: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-04-a-debian12-aarch64.tar.gz.sig
10+
name: Swift Development Snapshot
111
- date: 2025-11-03 10:10:00-06:00
212
dir: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-03-a
313
download: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-03-a-debian12-aarch64.tar.gz

_data/builds/swift-6_2-branch/debian12.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
- date: 2025-11-05 10:10:00-06:00
2+
dir: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-05-a
3+
download: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-05-a-debian12.tar.gz
4+
download_signature: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-05-a-debian12.tar.gz.sig
5+
name: Swift Development Snapshot
6+
- date: 2025-11-04 10:10:00-06:00
7+
dir: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-04-a
8+
download: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-04-a-debian12.tar.gz
9+
download_signature: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-04-a-debian12.tar.gz.sig
10+
name: Swift Development Snapshot
111
- date: 2025-11-03 10:10:00-06:00
212
dir: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-03-a
313
download: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-03-a-debian12.tar.gz

_data/builds/swift-6_2-branch/fedora39-aarch64.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
- date: 2025-11-05 10:10:00-06:00
2+
dir: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-05-a
3+
download: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-05-a-fedora39-aarch64.tar.gz
4+
download_signature: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-05-a-fedora39-aarch64.tar.gz.sig
5+
name: Swift Development Snapshot
6+
- date: 2025-11-04 10:10:00-06:00
7+
dir: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-04-a
8+
download: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-04-a-fedora39-aarch64.tar.gz
9+
download_signature: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-04-a-fedora39-aarch64.tar.gz.sig
10+
name: Swift Development Snapshot
111
- date: 2025-11-03 10:10:00-06:00
212
dir: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-03-a
313
download: swift-6.2-DEVELOPMENT-SNAPSHOT-2025-11-03-a-fedora39-aarch64.tar.gz

0 commit comments

Comments
 (0)