Skip to content

Commit 54eb644

Browse files
Split build steps, remove GDK dependency, add Homebrew formula bump
1 parent e78b573 commit 54eb644

File tree

2 files changed

+25
-18
lines changed

2 files changed

+25
-18
lines changed

.github/workflows/build.yml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
wget https://apt.llvm.org/llvm.sh
6464
chmod +x llvm.sh
6565
sudo ./llvm.sh 14
66-
sudo apt-get install librust-gdk-dev gcc-mingw-w64-x86-64 musl musl-tools gcc-aarch64-linux-gnu
66+
sudo apt-get install gcc-mingw-w64-x86-64 musl musl-tools gcc-aarch64-linux-gnu
6767
6868
- name: Lint code
6969
run: just lint
@@ -81,27 +81,33 @@ jobs:
8181
command: test
8282
args: --target=x86_64-unknown-linux-musl --no-default-features
8383

84-
- name: Build macOS
84+
- name: Build macOS Intel
8585
if: matrix.os == 'macos-latest'
86-
run: |
87-
just build-mac-intel
88-
just build-mac-arm
86+
run: just build-mac-intel
87+
88+
- name: Build macOS ARM
89+
if: matrix.os == 'macos-latest'
90+
run: just build-mac-arm
8991

9092
- name: Build Windows
9193
if: matrix.os == 'windows-latest'
9294
run: just build-win
9395

9496
- name: Build Linux
9597
if: matrix.os == 'ubuntu-latest'
96-
run: |
97-
just build-linux
98-
just build-linux-nogui
98+
run: just build-linux
99+
100+
- name: Build Linux nogui
101+
if: matrix.os == 'ubuntu-latest'
102+
run: just build-linux-nogui
99103

100104
- name: Build ARM Linux
101105
if: matrix.os == 'ubuntu-latest'
102-
run: |
103-
just build-linux-arm64
104-
just build-linux-arm64-nogui
106+
run: just build-linux-arm64
107+
108+
- name: Build ARM Linux nogui
109+
if: matrix.os == 'ubuntu-latest'
110+
run: just build-linux-arm64-nogui
105111

106112
- name: Build Windows GNU
107113
if: matrix.os == 'ubuntu-latest'

.github/workflows/release.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: Publish and Release
22

3-
# Only run when a tag is pushed
43
on:
54
push:
65
tags:
@@ -9,22 +8,18 @@ on:
98
jobs:
109
publish:
1110
runs-on: ubuntu-latest
12-
env:
13-
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
1411
steps:
1512
- uses: actions/checkout@v3
1613
- name: Install Rust
1714
uses: actions-rs/toolchain@v1
1815
with:
1916
toolchain: stable
20-
- name: Install dependencies
21-
run: |
22-
sudo apt-get update
23-
sudo apt-get install librust-gdk-dev
2417
- name: Upload to Crates
2518
uses: actions-rs/cargo@v1
2619
with:
2720
command: publish
21+
env:
22+
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
2823

2924
release:
3025
runs-on: ubuntu-latest
@@ -76,3 +71,9 @@ jobs:
7671
commit_username: "Ilesh Thiada"
7772
commit_email: [email protected]
7873
ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
74+
- name: Update Homebrew formula
75+
uses: mislav/bump-homebrew-formula-action@v2
76+
with:
77+
formula_name: ferium
78+
env:
79+
COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }}

0 commit comments

Comments
 (0)