Skip to content

Commit

Permalink
ci: Try to fix workflows
Browse files Browse the repository at this point in the history
Signed-off-by: Maksim Dimitrov <[email protected]>
  • Loading branch information
dimitrovmaksim committed Sep 11, 2023
1 parent dc1ce39 commit 88a2dd6
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 15 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/release-linux.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release (MacOS, Linux)
name: Release Linux

on:
release:
Expand All @@ -15,13 +15,9 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
name: [linux-18, linux-20, linux-22]
name: [linux-20, linux-22]

include:
- name: linux-18
os: ubuntu-18.04
artifact_name: matchstick
asset_name: binary-linux-18
- name: linux-20
os: ubuntu-20.04
artifact_name: matchstick
Expand All @@ -36,7 +32,10 @@ jobs:
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.68.0
- run: sudo apt-get install protobuf-compiler
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get -y install libpq-dev protobuf-compiler
- name: Build
run: cargo build --release && mv target/release/${{ matrix.artifact_name }} target/release/${{ matrix.asset_name }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release-macos-intel.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release (MacOS, Linux)
name: Release MacOS Intel

on:
release:
Expand All @@ -15,17 +15,17 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
name: [macos-10.15, macos-11]
name: [macos-11, macos-12]

include:
- name: macos-10.15
os: macos-10.15
artifact_name: matchstick
asset_name: binary-macos-10.15
- name: macos-11
os: macos-11
artifact_name: matchstick
asset_name: binary-macos-11
- name: macos-12
os: macos-12
artifact_name: matchstick
asset_name: binary-macos-12

steps:
- uses: actions/checkout@v3
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ jobs:
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.68.0
- run: sudo apt-get install protobuf-compiler
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get -y install libpq-dev protobuf-compiler
- run: cargo test

fmt:
Expand All @@ -53,6 +56,9 @@ jobs:
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.68.0
- run: sudo apt-get install protobuf-compiler
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get -y install libpq-dev protobuf-compiler
- run: rustup component add clippy
- run: cargo clippy -- -D warnings

0 comments on commit 88a2dd6

Please sign in to comment.