Skip to content

Commit 92b3b4a

Browse files
committed
update ci workflows
1 parent 351e9ac commit 92b3b4a

File tree

2 files changed

+10
-34
lines changed

2 files changed

+10
-34
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ on:
99
branches: [ master ]
1010

1111
jobs:
12-
linux:
13-
runs-on: ubuntu-22.04
12+
server:
13+
runs-on: ubuntu-24.04
1414
name: Amazon Linux 2023
1515

1616
strategy:

.github/workflows/package.yml

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -43,36 +43,12 @@ jobs:
4343
linux:
4444
runs-on: ubuntu-24.04
4545
name: Ubuntu 24.04
46-
47-
env:
48-
SWIFT_PREFIX: "swift-5.10.1-release/ubuntu2404/swift-5.10.1-RELEASE"
49-
SWIFT_ID: "swift-5.10.1-RELEASE-ubuntu24.04"
50-
5146
steps:
52-
- name: Cache Swift toolchain
53-
uses: actions/cache@v2
54-
with:
55-
path: ${{ env.SWIFT_ID }}.tar.gz
56-
key: ${{ env.SWIFT_ID }}
57-
58-
- name: Cache status
59-
id: cache_status
60-
uses: andstor/file-existence-action@v1
47+
- name: Install Swift
48+
uses: tayloraswift/swift-install-action@master
6149
with:
62-
files: ${{ env.SWIFT_ID }}.tar.gz
63-
64-
- name: Download Swift
65-
if: steps.cache_status.outputs.files_exists == 'false'
66-
run: |
67-
curl https://download.swift.org/$SWIFT_PREFIX/$SWIFT_ID.tar.gz \
68-
--output $SWIFT_ID.tar.gz
69-
70-
- name: Set up Swift
71-
run: |
72-
mkdir -p $HOME/$SWIFT_ID
73-
tar -xzf $SWIFT_ID.tar.gz -C $HOME/$SWIFT_ID --strip 1
74-
echo "$HOME/$SWIFT_ID/usr/bin" >> $GITHUB_PATH
75-
cat $GITHUB_PATH
50+
swift-prefix: "swift-5.10.1-release/ubuntu2404/swift-5.10.1-RELEASE"
51+
swift-id: "swift-5.10.1-RELEASE-ubuntu24.04"
7652

7753
# This clobbers everything in the current directory, which is why we installed
7854
# the Swift toolchain in the home directory.
@@ -89,13 +65,13 @@ jobs:
8965
swift build -c release \
9066
--static-swift-stdlib \
9167
--product unidoc-publish \
92-
-Xcxx -I$HOME/$SWIFT_ID/usr/lib/swift \
93-
-Xcxx -I$HOME/$SWIFT_ID/usr/lib/swift/Block
68+
-Xcxx -I$SWIFT_INSTALLATION/lib/swift \
69+
-Xcxx -I$SWIFT_INSTALLATION/lib/swift/Block
9470
swift build -c release \
9571
--static-swift-stdlib \
9672
--product unidoc-tools \
97-
-Xcxx -I$HOME/$SWIFT_ID/usr/lib/swift \
98-
-Xcxx -I$HOME/$SWIFT_ID/usr/lib/swift/Block
73+
-Xcxx -I$SWIFT_INSTALLATION/lib/swift \
74+
-Xcxx -I$SWIFT_INSTALLATION/lib/swift/Block
9975
10076
- name: Upload products
10177
env:

0 commit comments

Comments
 (0)