Skip to content

Commit b1c0b17

Browse files
committed
Fix GitHub Actions caching and make GNUStep downloads faster
1 parent 8c4bbda commit b1c0b17

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

.github/workflows/ci.yml

+14-8
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,16 @@ jobs:
3838

3939
steps:
4040
- uses: actions/checkout@v2
41+
4142
- name: Cache Rust
4243
uses: actions/cache@v2
4344
with:
4445
path: |
4546
~/.cargo/
4647
target/
47-
key: cargo-${{ matrix.platform.os }}
48+
key: ${{ matrix.platform.os }}-cargo-${{ hashFiles('Cargo.lock') }}
49+
restore-keys: |
50+
${{ matrix.platform.os }}-cargo-
4851
4952
- name: Install Packages
5053
if: contains(matrix.platform.os, 'ubuntu')
@@ -77,9 +80,10 @@ jobs:
7780
- name: Install GNUStep libobjc2
7881
if: contains(matrix.platform.os, 'ubuntu')
7982
run: |
80-
git clone -b 1.9 https://github.com/gnustep/libobjc2.git
81-
mkdir libobjc2/build
82-
cd libobjc2/build
83+
wget https://github.com/gnustep/libobjc2/archive/refs/tags/v1.9.tar.gz
84+
tar –xzf v1.9.tar.gz
85+
mkdir libobjc2-1.9/build
86+
cd libobjc2-1.9/build
8387
export CC="clang"
8488
export CXX="clang++"
8589
cmake ../
@@ -88,16 +92,18 @@ jobs:
8892
- name: Install GNUStep make
8993
if: contains(matrix.platform.os, 'ubuntu')
9094
run: |
91-
git clone -b make-2_9_0 https://github.com/gnustep/tools-make.git
92-
cd tools-make
95+
wget https://github.com/gnustep/tools-make/archive/refs/tags/make-2_9_0.tar.gz
96+
tar –xzf make-2_9_0.tar.gz
97+
cd tools-make-make-2_9_0
9398
./configure --with-library-combo=ng-gnu-gnu
9499
sudo make install
95100
96101
- name: Install GNUStep-Base
97102
if: contains(matrix.platform.os, 'ubuntu')
98103
run: |
99-
git clone -b base-1_28_0 https://github.com/gnustep/libs-base.git
100-
cd libs-base
104+
wget https://github.com/gnustep/libs-base/archive/refs/tags/base-1_28_0.tar.gz
105+
tar -xzf base-1_28_0.tar.gz
106+
cd libs-base-base-1_28_0
101107
./configure --disable-tls
102108
sudo make install
103109

0 commit comments

Comments
 (0)