Skip to content

Commit 7d57c6b

Browse files
committed
Enable self-hosted trunk build plus extend self-hosted timeout
1 parent acc46d3 commit 7d57c6b

File tree

1 file changed

+9
-20
lines changed

1 file changed

+9
-20
lines changed

.github/workflows/pull_request.yml

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,14 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
include:
31-
#- swift-version: 'swift-6.2-branch'
32-
# build-type: 'docker'
33-
# build-compiler: '1'
34-
# runner: 'self-hosted'
35-
#- swift-version: 'development'
36-
# build-type: 'docker'
37-
# build-compiler: '1'
38-
# runner: 'self-hosted'
39-
- swift-version: 'swift-6.2-branch'
31+
- swift-version: 'tag:swift-DEVELOPMENT-SNAPSHOT-2025-09-14-a'
32+
#- swift-version: 'tag:swift-6.2-DEVELOPMENT-SNAPSHOT-2025-09-10-a'
4033
build-type: 'docker'
41-
build-compiler: '0'
42-
runner: 'ubuntu-24.04'
43-
- swift-version: 'development'
44-
build-type: 'docker'
45-
build-compiler: '0'
46-
runner: 'ubuntu-24.04'
34+
build-compiler: '1'
35+
runner: 'self-hosted'
4736
runs-on: ${{ matrix.runner }}
48-
# 15 hour timeout
49-
timeout-minutes: 900
37+
# 16 hour timeout
38+
timeout-minutes: 960
5039
steps:
5140
- name: Free Disk Space
5241
if: ${{ matrix.runner != 'self-hosted' }}
@@ -63,7 +52,7 @@ jobs:
6352
run: |
6453
# these variabes are used by build-docker and build-local
6554
# to determine which Swift version to build for
66-
echo "BUILD_SCHEME=${{ matrix.swift-version }}" >> $GITHUB_ENV
55+
echo "SWIFT_VERSION=${{ matrix.swift-version }}" >> $GITHUB_ENV
6756
# pass the build-compiler matrix through to the build script
6857
echo "BUILD_COMPILER=${{ matrix.build-compiler }}" >> $GITHUB_ENV
6958
echo "TARGET_ARCHS=${{ matrix.arch }}" >> $GITHUB_ENV
@@ -75,12 +64,12 @@ jobs:
7564
working-directory: swift-ci/sdks/android
7665
run: |
7766
sudo apt install -q patchelf build-essential cmake ninja-build python3 golang git gnupg2 libcurl4-openssl-dev libedit-dev libicu-dev libncurses5-dev libpython3-dev libsqlite3-dev libxml2-dev rsync uuid-dev uuid-runtime tzdata curl unzip
78-
./build-local ${BUILD_SCHEME} ${WORKDIR}
67+
./build-local ${SWIFT_VERSION} ${WORKDIR}
7968
- name: Build Android SDK (Docker)
8069
if: ${{ matrix.build-type == 'docker' }}
8170
working-directory: swift-ci/sdks/android
8271
run: |
83-
./build-docker ${BUILD_SCHEME} ${WORKDIR}
72+
./build-docker ${SWIFT_VERSION} ${WORKDIR}
8473
- name: Install Host Toolchain
8574
if: ${{ matrix.build-type == 'docker' }}
8675
working-directory: swift-ci/sdks/android

0 commit comments

Comments
 (0)