Skip to content

Commit a0b77ed

Browse files
committed
no -ljemalloc in the prebuilt unidoc binary
1 parent 2045843 commit a0b77ed

File tree

2 files changed

+48
-3
lines changed

2 files changed

+48
-3
lines changed

.github/workflows/Deploy.yml

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,45 @@ jobs:
5656
- id: x86_64
5757
name: X64
5858

59+
runs-on: ubuntu-24.04
60+
name: "${{ matrix.os.display }} (${{ matrix.arch.id }})"
61+
steps:
62+
- name: Setup AWS CLI
63+
uses: aws-actions/configure-aws-credentials@v1
64+
with:
65+
aws-secret-access-key: ${{ secrets.AWS_S3_ACCESS_SECRET }}
66+
aws-access-key-id: ${{ vars.AWS_S3_ACCESS_KEY }}
67+
aws-region: us-east-1
68+
69+
- name: Checkout repository
70+
uses: actions/checkout@v3
71+
72+
- name: Build Unidoc
73+
run: |
74+
Scripts/Linux/Build ${{ matrix.arch.id }} \
75+
--os ${{ matrix.os.codename }} \
76+
--no-jemalloc
77+
Scripts/Package .build.${{ matrix.arch.id }} \
78+
unidoc
79+
80+
- name: Upload products
81+
env:
82+
UNIDOC_PLATFORM: "${{ matrix.os.version }}-${{ matrix.arch.name }}"
83+
UNIDOC_VERSION: ${{ github.head_ref || github.ref_name }}
84+
85+
run: Scripts/Deploy unidoc.tar.gz
86+
87+
linux_server:
88+
strategy:
89+
matrix:
90+
os:
91+
- codename: noble
92+
version: Ubuntu-24.04
93+
display: Ubuntu 24.04
94+
arch:
95+
- id: aarch64
96+
name: ARM64
97+
5998
runs-on: ubuntu-24.04
6099
name: "${{ matrix.os.display }} (${{ matrix.arch.id }})"
61100
steps:
@@ -74,12 +113,11 @@ jobs:
74113
Scripts/Linux/Build ${{ matrix.arch.id }} \
75114
--os ${{ matrix.os.codename }}
76115
Scripts/Package .build.${{ matrix.arch.id }} \
77-
unidoc \
78116
unidoc-linkerd
79117
80118
- name: Upload products
81119
env:
82120
UNIDOC_PLATFORM: "${{ matrix.os.version }}-${{ matrix.arch.name }}"
83121
UNIDOC_VERSION: ${{ github.head_ref || github.ref_name }}
84122

85-
run: Scripts/Deploy unidoc.tar.gz unidoc-linkerd.tar.gz
123+
run: Scripts/Deploy unidoc-linkerd.tar.gz

Scripts/Linux/Build

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,15 @@ DEST_ARCH=aarch64
66
DEST_OS=noble
77
LIBC=gnu
88

9+
LINKER_FLAGS="-Xlinker -ljemalloc"
10+
911
while [[ $# -gt 0 ]]; do
1012
case $1 in
13+
--no-jemalloc )
14+
shift
15+
LINKER_FLAGS=""
16+
;;
17+
1118
--os )
1219
shift
1320

@@ -50,4 +57,4 @@ docker run --rm \
5057
--cache-path /swiftpm \
5158
--destination Scripts/Linux/$HOST_ARCH/$DEST_ARCH-$DEST_OS.json \
5259
--static-swift-stdlib \
53-
-Xlinker -ljemalloc
60+
$LINKER_FLAGS

0 commit comments

Comments
 (0)