Skip to content

Commit 4843036

Browse files
committed
fix cicd, step 30
1 parent 148b0c6 commit 4843036

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

.github/workflows/client_build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ jobs:
7373
target/
7474
key: ${{ matrix.settings.host }}-${{ matrix.settings.target }}-cargo-${{ hashFiles('**/Cargo.lock') }}
7575
restore-keys: ${{ matrix.settings.host }}-cargo-${{ matrix.settings.target }}
76-
- name: Setup tmate session
77-
uses: mxschmitt/action-tmate@v3
78-
# - name: Build
79-
# run: ${{ matrix.settings.build }}
76+
# - name: Setup tmate session
77+
# uses: mxschmitt/action-tmate@v3
78+
- name: Build
79+
run: ${{ matrix.settings.build }}
8080

81-
# - name: Upload artifact
82-
# uses: actions/upload-artifact@v2
83-
# with:
84-
# path: /release/*
85-
# if-no-files-found: error
81+
- name: Upload artifact
82+
uses: actions/upload-artifact@v2
83+
with:
84+
path: release/*
85+
if-no-files-found: error

Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33

44
#base_dir := $(shell pwd)
55

6-
export PROTOC := $(shell pwd)/protoc/bin
6+
#export PROTOC := $(shell pwd)/protoc/bin
77

88
release-mac-x86_64:
9-
mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && chmod +x bin/protoc
10-
cp -r protoc/include/* protobuf/
9+
mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && sudo cp bin/protoc /usr/bin
1110
brew install cmake
1211
mkdir -p release
1312
cd client && cargo build --release
@@ -19,7 +18,7 @@ release-mac-x86_64:
1918
ls -lisah release/fornet-mac-x86_64.tar.gz
2019

2120
release-mac-aarch64:
22-
mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip && chmod +x bin/protoc
21+
mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip && sudo cp bin/protoc /usr/bin
2322
cp -r protoc/include/* protobuf/
2423
brew install cmake
2524
mkdir -p release
@@ -32,7 +31,7 @@ release-mac-aarch64:
3231
ls -lisah release/fornet-mac-aarch64.tar.gz
3332

3433
release-linux:
35-
mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && chmod +x bin/protoc
34+
mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && sudo cp bin/protoc /usr/bin
3635
cp -r protoc/include/* protobuf/
3736
sudo apt-get install -y build-essential libssl-dev cmake
3837
mkdir release

0 commit comments

Comments
 (0)