Skip to content

Commit 5641ee4

Browse files
ktosoktoso
committed
try manually...
1 parent feb0372 commit 5641ee4

File tree

4 files changed

+196
-180
lines changed

4 files changed

+196
-180
lines changed

‎.github/scripts/install_swiftly.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ else
4242
curl -O https://download.swift.org/swiftly/darwin/swiftly.pkg && pkgutil --check-signature swiftly.pkg && pkgutil --verbose --expand swiftly.pkg "${SWIFTLY_HOME_DIR}" && tar -C "${SWIFTLY_HOME_DIR}" -xvf "${SWIFTLY_HOME_DIR}"/swiftly-*/Payload && "$SWIFTLY_HOME_DIR/bin/swiftly" init -y --skip-install
4343

4444
# shellcheck disable=SC1091
45+
chmod +x "$SWIFTLY_HOME_DIR/env.sh"
4546
. "$SWIFTLY_HOME_DIR/env.sh"
4647
fi
4748

@@ -84,5 +85,8 @@ echo "Displaying swift version"
8485
swiftly run "${runSelector[@]}" swift --version
8586

8687
if [[ "$(uname -s)" == "Linux" ]]; then
87-
CC=clang swiftly run "${runSelector[@]}" "$(dirname "$0")/install-libarchive.sh"
88+
if [[ -f "$(dirname "$0")/install-libarchive.sh" ]]; then
89+
CC=clang swiftly run "${runSelector[@]}" "$(dirname "$0")/install-libarchive.sh"
90+
fi
8891
fi
92+

‎.github/scripts/validate_docs.sh‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/bash
2+
3+
set -e
4+
set -x
5+
6+
cat <<EOF >> Package.swift
7+
8+
package.dependencies.append(
9+
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0")
10+
)
11+
EOF
12+
13+
echo "Active Swift:"
14+
which swift
15+
swift -version
16+
17+
swift package --disable-sandbox plugin generate-documentation --target "SwiftJavaDocumentation" --warnings-as-errors --analyze

‎.github/workflows/pull_request.yml‎

Lines changed: 173 additions & 175 deletions
Original file line numberDiff line numberDiff line change
@@ -26,187 +26,185 @@ jobs:
2626
fail-fast: true
2727
matrix:
2828
swift_version: ['6.1.2']
29+
os_version: ['jammy']
2930
jdk_vendor: ['corretto']
3031
env:
3132
ADDITIONAL_DOCC_ARGUMENTS: ''
3233
steps:
3334
- uses: actions/checkout@v4
3435
- name: Prepare CI Environment
3536
uses: ./.github/actions/prepare_env
36-
- name: Install Swiftly
37-
run: ./.github/scripts/install_swiftly.sh
38-
env:
39-
SWIFT_VERSION: "${{ matrix.swift_version }}"
37+
# - name: Install Swiftly / Swift ${{ matrix.swift_version }}
38+
# shell: bash
39+
# run: ./.github/scripts/install_swiftly.sh
4040
- name: Run documentation check
41-
run: |
42-
which curl || (apt -q update && apt -yq install curl)
43-
curl -s --retry 3 https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/check-docs.sh | bash
44-
45-
test-java:
46-
name: Test (Java) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
47-
runs-on: ubuntu-latest
48-
strategy:
49-
fail-fast: true
50-
matrix:
51-
swift_version: ['6.1.2']
52-
os_version: ['jammy']
53-
jdk_vendor: ['corretto']
54-
container:
55-
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
56-
env:
57-
SWIFT_JAVA_VERBOSE: true
58-
steps:
59-
- uses: actions/checkout@v4
60-
- name: Prepare CI Environment
61-
uses: ./.github/actions/prepare_env
62-
- name: Gradle :SwiftKitCore:build
63-
run: ./gradlew :SwiftKitCore:build -x test
64-
- name: Gradle :SwiftKitCore:check
65-
run: ./gradlew :SwiftKitCore:check --info
66-
- name: Gradle :SwiftKitFFM:build
67-
run: ./gradlew :SwiftKitFFM:build -x test
68-
- name: Gradle :SwiftKitFFM:check
69-
run: ./gradlew :SwiftKitFFM:check --info
70-
71-
test-java-macos:
72-
name: Test (Java) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
73-
runs-on: [self-hosted, macos, sequoia, ARM64]
74-
strategy:
75-
fail-fast: true
76-
matrix:
77-
swift_version: ['6.1.2']
78-
os_version: ['macos']
79-
jdk_vendor: ['corretto']
80-
env:
81-
SWIFT_JAVA_VERBOSE: true
82-
steps:
83-
- uses: actions/checkout@v4
84-
- name: Prepare CI Environment
85-
uses: ./.github/actions/prepare_env
86-
- name: Gradle :SwiftKitCore:build
87-
run: ./gradlew :SwiftKitCore:build -x test
88-
- name: Gradle :SwiftKitCore:check
89-
run: ./gradlew :SwiftKitCore:check --debug
90-
- name: Gradle :SwiftKitFFM:build
91-
run: ./gradlew :SwiftKitFFM:build -x test
92-
- name: Gradle :SwiftKitFFM:check
93-
run: ./gradlew :SwiftKitFFM:check --debug
94-
95-
benchmark-java:
96-
name: Benchmark (JMH) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
97-
runs-on: ubuntu-latest
98-
strategy:
99-
fail-fast: true
100-
matrix:
101-
swift_version: ['6.1.2']
102-
os_version: ['jammy']
103-
jdk_vendor: ['corretto']
104-
container:
105-
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
106-
env:
107-
SWIFT_JAVA_VERBOSE: true
108-
steps:
109-
- uses: actions/checkout@v4
110-
- name: Prepare CI Environment
111-
uses: ./.github/actions/prepare_env
112-
- name: Gradle compile JMH benchmarks
113-
run: ./gradlew compileJmh --info
114-
115-
test-swift:
116-
name: Test (Swift) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
117-
runs-on: ubuntu-latest
118-
strategy:
119-
fail-fast: false
120-
matrix:
121-
swift_version: ['6.1.2']
122-
os_version: ['jammy']
123-
jdk_vendor: ['corretto']
124-
container:
125-
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
126-
env:
127-
SWIFT_JAVA_VERBOSE: true
128-
steps:
129-
- uses: actions/checkout@v4
130-
- name: Prepare CI Environment
131-
uses: ./.github/actions/prepare_env
132-
- name: Swift Build
133-
run: "swift build --build-tests --disable-sandbox"
134-
- name: Swift Test
135-
run: "swift test"
136-
137-
test-swift-macos:
138-
name: Test (Swift) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
139-
runs-on: [self-hosted, macos, sequoia, ARM64]
140-
strategy:
141-
fail-fast: false
142-
matrix:
143-
swift_version: ['6.1.2']
144-
os_version: ['macos']
145-
jdk_vendor: ['corretto']
146-
env:
147-
SWIFT_JAVA_VERBOSE: true
148-
steps:
149-
- uses: actions/checkout@v4
150-
- name: Prepare CI Environment
151-
uses: ./.github/actions/prepare_env
152-
- name: Swift Build
153-
run: "swift build --build-tests --disable-sandbox"
154-
- name: Swift Test
155-
run: "swift test"
41+
run: ./.github/scripts/validate_docs.sh
15642

157-
verify-samples:
158-
name: Sample ${{ matrix.sample_app }} (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
159-
runs-on: ubuntu-latest
160-
strategy:
161-
fail-fast: false
162-
matrix:
163-
swift_version: ['6.1.2']
164-
os_version: ['jammy']
165-
jdk_vendor: ['corretto']
166-
sample_app: [ # TODO: use a reusable-workflow to generate those names
167-
'JavaDependencySampleApp',
168-
'JavaKitSampleApp',
169-
'JavaProbablyPrime',
170-
'JavaSieve',
171-
'SwiftAndJavaJarSampleLib',
172-
'SwiftKitSampleApp',
173-
'JExtractJNISampleApp',
174-
]
175-
container:
176-
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
177-
steps:
178-
- uses: actions/checkout@v4
179-
- name: Prepare CI Environment
180-
uses: ./.github/actions/prepare_env
181-
- name: "Verify sample: ${{ matrix.sample_app }}"
182-
run: .github/scripts/validate_sample.sh Samples/${{ matrix.sample_app }}
183-
184-
185-
verify-samples-macos:
186-
name: Sample ${{ matrix.sample_app }} (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
187-
runs-on: [self-hosted, macos, sequoia, ARM64]
188-
strategy:
189-
fail-fast: false
190-
matrix:
191-
swift_version: ['6.1.2']
192-
os_version: ['macos']
193-
jdk_vendor: ['corretto']
194-
sample_app: [ # TODO: use a reusable-workflow to generate those names
195-
'JavaDependencySampleApp',
196-
'JavaKitSampleApp',
197-
'JavaProbablyPrime',
198-
'JavaSieve',
199-
'SwiftAndJavaJarSampleLib',
200-
'SwiftKitSampleApp',
201-
'JExtractJNISampleApp',
202-
]
203-
steps:
204-
- uses: actions/checkout@v4
205-
- name: Prepare CI Environment
206-
uses: ./.github/actions/prepare_env
207-
- name: Install Swiftly # we specifically install Swiftly in macOS jobs because we want a simpler way to find the right dylib paths for libraries
208-
run: ./.github/scripts/install_swiftly.sh
209-
env:
210-
SWIFT_VERSION: "${{ matrix.swift_version }}"
211-
- name: "Verify sample ${{ matrix.sample_app }}"
212-
run: .github/scripts/validate_sample.sh Samples/${{ matrix.sample_app }}
43+
# test-java:
44+
# name: Test (Java) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
45+
# runs-on: ubuntu-latest
46+
# strategy:
47+
# fail-fast: true
48+
# matrix:
49+
# swift_version: ['6.1.2']
50+
# os_version: ['jammy']
51+
# jdk_vendor: ['corretto']
52+
# container:
53+
# image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
54+
# env:
55+
# SWIFT_JAVA_VERBOSE: true
56+
# steps:
57+
# - uses: actions/checkout@v4
58+
# - name: Prepare CI Environment
59+
# uses: ./.github/actions/prepare_env
60+
# - name: Gradle :SwiftKitCore:build
61+
# run: ./gradlew :SwiftKitCore:build -x test
62+
# - name: Gradle :SwiftKitCore:check
63+
# run: ./gradlew :SwiftKitCore:check --info
64+
# - name: Gradle :SwiftKitFFM:build
65+
# run: ./gradlew :SwiftKitFFM:build -x test
66+
# - name: Gradle :SwiftKitFFM:check
67+
# run: ./gradlew :SwiftKitFFM:check --info
68+
#
69+
# test-java-macos:
70+
# name: Test (Java) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
71+
# runs-on: [self-hosted, macos, sequoia, ARM64]
72+
# strategy:
73+
# fail-fast: true
74+
# matrix:
75+
# swift_version: ['6.1.2']
76+
# os_version: ['macos']
77+
# jdk_vendor: ['corretto']
78+
# env:
79+
# SWIFT_JAVA_VERBOSE: true
80+
# steps:
81+
# - uses: actions/checkout@v4
82+
# - name: Prepare CI Environment
83+
# uses: ./.github/actions/prepare_env
84+
# - name: Gradle :SwiftKitCore:build
85+
# run: ./gradlew :SwiftKitCore:build -x test
86+
# - name: Gradle :SwiftKitCore:check
87+
# run: ./gradlew :SwiftKitCore:check --debug
88+
# - name: Gradle :SwiftKitFFM:build
89+
# run: ./gradlew :SwiftKitFFM:build -x test
90+
# - name: Gradle :SwiftKitFFM:check
91+
# run: ./gradlew :SwiftKitFFM:check --debug
92+
#
93+
# benchmark-java:
94+
# name: Benchmark (JMH) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
95+
# runs-on: ubuntu-latest
96+
# strategy:
97+
# fail-fast: true
98+
# matrix:
99+
# swift_version: ['6.1.2']
100+
# os_version: ['jammy']
101+
# jdk_vendor: ['corretto']
102+
# container:
103+
# image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
104+
# env:
105+
# SWIFT_JAVA_VERBOSE: true
106+
# steps:
107+
# - uses: actions/checkout@v4
108+
# - name: Prepare CI Environment
109+
# uses: ./.github/actions/prepare_env
110+
# - name: Gradle compile JMH benchmarks
111+
# run: ./gradlew compileJmh --info
112+
#
113+
# test-swift:
114+
# name: Test (Swift) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
115+
# runs-on: ubuntu-latest
116+
# strategy:
117+
# fail-fast: false
118+
# matrix:
119+
# swift_version: ['6.1.2']
120+
# os_version: ['jammy']
121+
# jdk_vendor: ['corretto']
122+
# container:
123+
# image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
124+
# env:
125+
# SWIFT_JAVA_VERBOSE: true
126+
# steps:
127+
# - uses: actions/checkout@v4
128+
# - name: Prepare CI Environment
129+
# uses: ./.github/actions/prepare_env
130+
# - name: Swift Build
131+
# run: "swift build --build-tests --disable-sandbox"
132+
# - name: Swift Test
133+
# run: "swift test"
134+
#
135+
# test-swift-macos:
136+
# name: Test (Swift) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
137+
# runs-on: [self-hosted, macos, sequoia, ARM64]
138+
# strategy:
139+
# fail-fast: false
140+
# matrix:
141+
# swift_version: ['6.1.2']
142+
# os_version: ['macos']
143+
# jdk_vendor: ['corretto']
144+
# env:
145+
# SWIFT_JAVA_VERBOSE: true
146+
# steps:
147+
# - uses: actions/checkout@v4
148+
# - name: Prepare CI Environment
149+
# uses: ./.github/actions/prepare_env
150+
# - name: Swift Build
151+
# run: "swift build --build-tests --disable-sandbox"
152+
# - name: Swift Test
153+
# run: "swift test"
154+
#
155+
# verify-samples:
156+
# name: Sample ${{ matrix.sample_app }} (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
157+
# runs-on: ubuntu-latest
158+
# strategy:
159+
# fail-fast: false
160+
# matrix:
161+
# swift_version: ['6.1.2']
162+
# os_version: ['jammy']
163+
# jdk_vendor: ['corretto']
164+
# sample_app: [ # TODO: use a reusable-workflow to generate those names
165+
# 'JavaDependencySampleApp',
166+
# 'JavaKitSampleApp',
167+
# 'JavaProbablyPrime',
168+
# 'JavaSieve',
169+
# 'SwiftAndJavaJarSampleLib',
170+
# 'SwiftKitSampleApp',
171+
# 'JExtractJNISampleApp',
172+
# ]
173+
# container:
174+
# image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
175+
# steps:
176+
# - uses: actions/checkout@v4
177+
# - name: Prepare CI Environment
178+
# uses: ./.github/actions/prepare_env
179+
# - name: "Verify sample: ${{ matrix.sample_app }}"
180+
# run: .github/scripts/validate_sample.sh Samples/${{ matrix.sample_app }}
181+
#
182+
#
183+
# verify-samples-macos:
184+
# name: Sample ${{ matrix.sample_app }} (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
185+
# runs-on: [self-hosted, macos, sequoia, ARM64]
186+
# strategy:
187+
# fail-fast: false
188+
# matrix:
189+
# swift_version: ['6.1.2']
190+
# os_version: ['macos']
191+
# jdk_vendor: ['corretto']
192+
# sample_app: [ # TODO: use a reusable-workflow to generate those names
193+
# 'JavaDependencySampleApp',
194+
# 'JavaKitSampleApp',
195+
# 'JavaProbablyPrime',
196+
# 'JavaSieve',
197+
# 'SwiftAndJavaJarSampleLib',
198+
# 'SwiftKitSampleApp',
199+
# 'JExtractJNISampleApp',
200+
# ]
201+
# steps:
202+
# - uses: actions/checkout@v4
203+
# - name: Prepare CI Environment
204+
# uses: ./.github/actions/prepare_env
205+
# - name: Install Swiftly # we specifically install Swiftly in macOS jobs because we want a simpler way to find the right dylib paths for libraries
206+
# run: ./.github/scripts/install_swiftly.sh
207+
# env:
208+
# SWIFT_VERSION: "${{ matrix.swift_version }}"
209+
# - name: "Verify sample ${{ matrix.sample_app }}"
210+
# run: .github/scripts/validate_sample.sh Samples/${{ matrix.sample_app }}

0 commit comments

Comments
 (0)