Skip to content

Commit 1576088

Browse files
committed
Update github action with glibc-2.17 builds
1 parent 19b7b47 commit 1576088

File tree

2 files changed

+33
-10
lines changed

2 files changed

+33
-10
lines changed

.github/workflows/build-toolchain.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
arch:
99
type: string
1010
required: true
11+
tuple:
12+
type: string
13+
required: true
1114
pkg:
1215
type: string
1316
required: true
@@ -45,16 +48,16 @@ jobs:
4548
- name: Install additional libraries
4649
run: |
4750
set -e
48-
chmod 0755 -R `pwd`/toolchain-dir/${{ inputs.pkg }}
51+
chmod 0755 -R `pwd`/toolchain-dir/${{ inputs.tuple }}
4952
./sysroot-scripts/sysroot-creator.sh build ${{ inputs.arch }} \
50-
`pwd`/toolchain-dir/${{ inputs.pkg }}/${{ inputs.pkg }}/sysroot
53+
`pwd`/toolchain-dir/${{ inputs.tuple }}/${{ inputs.tuple }}/sysroot
5154
- name: Create pipeline asset
5255
run: |
5356
set -e
5457
cd toolchain-dir
55-
tar -czf ${{ inputs.pkg }}.tar.gz ${{ inputs.pkg }}
58+
tar -czf ${{ inputs.pkg }}.tar.gz ${{ inputs.tuple }}
5659
- name: Publish artifact
5760
uses: actions/upload-artifact@v3
5861
with:
59-
name: ${{ inputs.arch }}
62+
name: ${{ inputs.pkg }}
6063
path: toolchain-dir/${{ inputs.pkg }}.tar.gz

.github/workflows/build.yml

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,33 @@ jobs:
1717
include:
1818
- arch: amd64
1919
config: x86_64-gcc-8.5.0-glibc-2.28.config
20-
pkg: x86_64-linux-gnu
20+
tuple: x86_64-linux-gnu
21+
pkg: x86_64-linux-gnu-glibc-2.28
22+
- arch: amd64
23+
config: x86_64-gcc-7.5.0-glibc-2.17.config
24+
tuple: x86_64-linux-gnu
25+
pkg: x86_64-linux-gnu-glibc-2.17
2126
- arch: arm64
2227
config: aarch64-gcc-8.5.0-glibc-2.28.config
23-
pkg: aarch64-linux-gnu
28+
tuple: aarch64-linux-gnu
29+
pkg: aarch64-linux-gnu-glibc-2.28
30+
- arch: arm64
31+
config: aarch64-gcc-7.5.0-glibc-2.17.config
32+
tuple: aarch64-linux-gnu
33+
pkg: aarch64-linux-gnu-glibc-2.17
2434
- arch: armhf
2535
config: armhf-gcc-8.5.0-glibc-2.28.config
26-
pkg: arm-rpi-linux-gnueabihf
36+
tuple: arm-rpi-linux-gnueabihf
37+
pkg: arm-rpi-linux-gnueabihf-glibc-2.28
38+
- arch: armhf
39+
config: armhf-gcc-7.5.0-glibc-2.17.config
40+
tuple: arm-rpi-linux-gnueabihf
41+
pkg: arm-rpi-linux-gnueabihf-glibc-2.17
2742
uses: ./.github/workflows/build-toolchain.yml
2843
with:
2944
config: ${{ matrix.config }}
3045
arch: ${{ matrix.arch }}
46+
tuple: ${{ matrix.tuple }}
3147
pkg: ${{ matrix.pkg }}
3248

3349
release_toolchain:
@@ -42,9 +58,13 @@ jobs:
4258
- run: |
4359
mkdir upload
4460
45-
cp artifacts/amd64/x86_64-linux-gnu.tar.gz upload/x86_64-linux-gnu.tar.gz
46-
cp artifacts/arm64/aarch64-linux-gnu.tar.gz upload/aarch64-linux-gnu.tar.gz
47-
cp artifacts/armhf/arm-rpi-linux-gnueabihf.tar.gz upload/arm-rpi-linux-gnueabihf.tar.gz
61+
cp artifacts/x86_64-linux-gnu-glibc-2.28/x86_64-linux-gnu-glibc-2.28.tar.gz upload/x86_64-linux-gnu-glibc-2.28.tar.gz
62+
cp artifacts/aarch64-linux-gnu-glibc-2.28/aarch64-linux-gnu-glibc-2.28.tar.gz upload/aarch64-linux-gnu-glibc-2.28.tar.gz
63+
cp artifacts/arm-rpi-linux-gnueabihf-glibc-2.28/arm-rpi-linux-gnueabihf-glibc-2.28.tar.gz upload/arm-rpi-linux-gnueabihf-glibc-2.28.tar.gz
64+
65+
cp artifacts/x86_64-linux-gnu-glibc-2.17/x86_64-linux-gnu-glibc-2.17.tar.gz upload/x86_64-linux-gnu-glibc-2.17.tar.gz
66+
cp artifacts/aarch64-linux-gnu-glibc-2.17/aarch64-linux-gnu-glibc-2.17.tar.gz upload/aarch64-linux-gnu-glibc-2.17.tar.gz
67+
cp artifacts/arm-rpi-linux-gnueabihf-glibc-2.17/arm-rpi-linux-gnueabihf-glibc-2.17.tar.gz upload/arm-rpi-linux-gnueabihf-glibc-2.17.tar.gz
4868
4969
cd upload
5070
shasum -a 256 *.tar.gz > SHASUMS256.txt

0 commit comments

Comments
 (0)