Skip to content

Commit 68e31cf

Browse files
awakecodingMarc-André Moreau
andauthored
add cctools prebuilt workflow (#3)
Co-authored-by: Marc-André Moreau <mamoreau@devolutions.net>
1 parent c2bec33 commit 68e31cf

File tree

2 files changed

+11
-20
lines changed

2 files changed

+11
-20
lines changed

.github/workflows/cctools-prebuilt.yml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,18 @@ name: cctools prebuilt
22
on: workflow_dispatch
33
jobs:
44
build:
5-
name: cctools ${{matrix.version}} [${{matrix.arch}}-${{matrix.os}}]
5+
name: cctools [${{matrix.arch}}-${{matrix.os}}]
66
runs-on: ${{matrix.runner}}
77
strategy:
88
fail-fast: false
99
matrix:
1010
arch: [ x86_64 ]
11-
os: [ macos, linux ]
11+
os: [ linux ]
1212

1313
include:
14-
- os: macos
15-
runner: macos-10.15
1614
- os: linux
1715
runner: ubuntu-18.04
1816
steps:
19-
- name: Configure macOS runner
20-
if: runner.os == 'macOS'
21-
env:
22-
CMAKE_OSX_DEPLOYMENT_TARGET: "10.12"
23-
run: |
24-
brew install git ninja
25-
2617
- name: Configure Linux runner
2718
if: runner.os == 'Linux'
2819
run: |
@@ -53,18 +44,18 @@ jobs:
5344
run: |
5445
git clone https://github.com/tpoechtrager/cctools-port.git
5546
cd cctools-port/cctools
56-
./configure --prefix=/tmp/cctools --with-libtapi=/tmp/cctools --with-libxar=/tmp/cctools --target=x86_64-apple-darwin11 --program-prefix=apple-
47+
./configure --prefix=/tmp/cctools --with-libtapi=/tmp/cctools --with-libxar=/tmp/cctools
5748
make
5849
make install
5950
cd ../..
6051
6152
- name: Package cctools
6253
run: |
63-
mv /tmp/cctools ./cctools-${{matrix.version}}-${{matrix.arch}}-${{matrix.os}}
64-
tar -cJf ctools-${{matrix.version}}-${{matrix.arch}}-${{matrix.os}}.tar.xz ctools-${{matrix.version}}-${{matrix.arch}}-${{matrix.os}}
54+
mv /tmp/cctools ./cctools-${{matrix.arch}}-${{matrix.os}}
55+
tar -cJf cctools-${{matrix.arch}}-${{matrix.os}}.tar.xz cctools-${{matrix.arch}}-${{matrix.os}}
6556
6657
- name: Upload cctools package
6758
uses: actions/upload-artifact@v2
6859
with:
69-
name: cctools-${{matrix.version}}-${{matrix.arch}}-${{matrix.os}}
70-
path: cctools-${{matrix.version}}-${{matrix.arch}}-${{matrix.os}}.tar.xz
60+
name: cctools-${{matrix.arch}}-${{matrix.os}}
61+
path: cctools-${{matrix.arch}}-${{matrix.os}}.tar.xz

.github/workflows/llvm-prebuilt.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,17 @@ jobs:
8989
- name: Package LLVM
9090
if: runner.os != 'Windows'
9191
run: |
92-
mv llvm-install clang+llvm
93-
tar -cJf clang+llvm.tar.xz clang+llvm
92+
mv llvm-install clang+llvm-${{matrix.version}}-${{matrix.arch}}-${{matrix.os}}
93+
tar -cJf clang+llvm-${{matrix.version}}-${{matrix.arch}}-${{matrix.os}}.tar.xz clang+llvm-${{matrix.version}}-${{matrix.arch}}-${{matrix.os}}
9494
9595
- name: Package LLVM
9696
if: runner.os == 'Windows'
9797
run: |
9898
ren llvm-install clang+llvm
99-
cmd.exe /c "7z a -ttar -snl -so clang+llvm.tar clang+llvm/* | 7z a -si clang+llvm.tar.xz"
99+
cmd.exe /c "7z a -ttar -snl -so clang+llvm-${{matrix.version}}-${{matrix.arch}}-${{matrix.os}}.tar clang+llvm-${{matrix.version}}-${{matrix.arch}}-${{matrix.os}} | 7z a -si clang+llvm-${{matrix.version}}-${{matrix.arch}}-${{matrix.os}}.tar.xz"
100100
101101
- name: Upload LLVM package
102102
uses: actions/upload-artifact@v2
103103
with:
104104
name: clang+llvm-${{matrix.version}}-${{matrix.arch}}-${{matrix.os}}
105-
path: clang+llvm.tar.xz
105+
path: clang+llvm-${{matrix.version}}-${{matrix.arch}}-${{matrix.os}}.tar.xz

0 commit comments

Comments
 (0)