Skip to content

Commit 2fd4414

Browse files
committed
Move all Linux build logic into the workflow
Signed-off-by: Jeremy Massel <[email protected]>
1 parent cd41cfc commit 2fd4414

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ jobs:
3333
steps:
3434
- name: Checkout
3535
uses: actions/checkout@v1
36-
- name: Install Ruby
37-
run: apt-get update && apt-get install -y ruby zlib1g-dev
3836
- name: Build and Run
39-
run: LANG=en_US.UTF-8 LC_CTYPE=UTF-8 rake build[release]
37+
run: swift build
4038
- name: Test
41-
run: LANG=en_US.UTF-8 LC_CTYPE=UTF-8 rake test
39+
run: swift test

.github/workflows/release.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,28 @@ jobs:
4949
steps:
5050
- name: Checkout
5151
uses: actions/checkout@v1
52-
- name: Install Ruby
53-
run: apt-get update && apt-get install -y ruby zlib1g-dev
52+
53+
# Build with dynamically linked stdlib
5454
- name: Build
55-
run: LANG=en_US.UTF-8 LC_CTYPE=UTF-8 rake build[release]
55+
run: swift build -c release
5656
- name: Set tag name
5757
run: echo "TAG_NAME=$(echo $GITHUB_REF | cut -c 11-)" >> $GITHUB_ENV
5858
- name: Zip release
5959
uses: montudor/[email protected]
6060
with:
6161
args: zip -j XCLogParser-linux-amd64.zip .build/release/xclogparser
62-
- name: Rename zip
63-
run: "mkdir releases && mv XCLogParser-linux-amd64.zip releases/XCLogParser-linux-amd64-$TAG_NAME.zip"
62+
63+
# Build standalone
64+
- name: Build
65+
run: swift build -c release --static-swift-stdlib
66+
- name: Zip release
67+
uses: montudor/[email protected]
68+
with:
69+
args: zip -j XCLogParser-linux-amd64-standalone.zip .build/release/xclogparser
70+
71+
# Package
72+
- name: Rename Zip Files
73+
run: "mkdir -p releases && mv *.zip releases/"
6474
- name: Upload binaries to release
6575
uses: svenstaro/upload-release-action@v1-release
6676
with:

0 commit comments

Comments
 (0)