Skip to content

Commit e8664d3

Browse files
committed
format yaml, add cryptsetup to test flow
1 parent 4b504db commit e8664d3

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

.github/workflows/rpmbuild-debug.yml

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
on:
2-
push:
3-
pull_request:
2+
push:
3+
pull_request:
44

55
name: Build RPM snapshot package
66

77
jobs:
8-
build:
9-
runs-on: ubuntu-latest
10-
container:
11-
image: ghcr.io/terrapkg/builder:f41
12-
steps:
13-
- uses: actions/checkout@v4
8+
build:
9+
runs-on: ubuntu-latest
10+
container:
11+
image: ghcr.io/terrapkg/builder:f41
12+
steps:
13+
- uses: actions/checkout@v4
1414

15-
- name: Install dependencies
16-
run: |
17-
dnf4 up -y
18-
dnf4 -y install dnf-plugins-core
19-
# builddep is broken with dnf5 for some reason
20-
dnf4 builddep -y ci/readymade.spec
21-
dnf4 in -y rpmdevtools git rpm-build
15+
- name: Install dependencies
16+
run: |
17+
dnf4 up -y
18+
dnf4 -y install dnf-plugins-core
19+
# builddep is broken with dnf5 for some reason
20+
dnf4 builddep -y ci/readymade.spec
21+
dnf4 in -y rpmdevtools git rpm-build
2222
23-
- name: run rpmbuild
24-
run: |
25-
git_sha=${{ github.sha }}
26-
git_short=${git_sha:0:7}
27-
rpmdev-setuptree
28-
rpmbuild -ba ci/readymade.spec --define "gitcommit $git_sha" --define "shortcommit $git_short" --define "_rpmdir $PWD/build" --define "_disable_source_fetch 0"
23+
- name: run rpmbuild
24+
run: |
25+
git_sha=${{ github.sha }}
26+
git_short=${git_sha:0:7}
27+
rpmdev-setuptree
28+
rpmbuild -ba ci/readymade.spec --define "gitcommit $git_sha" --define "shortcommit $git_short" --define "_rpmdir $PWD/build" --define "_disable_source_fetch 0"
2929
30-
- name: Upload artifacts
31-
uses: actions/upload-artifact@v4
32-
with:
33-
path: build/**/*.rpm
30+
- name: Upload artifacts
31+
uses: actions/upload-artifact@v4
32+
with:
33+
path: build/**/*.rpm

.github/workflows/rust.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: Rust
22

33
on:
4-
push:
5-
pull_request:
4+
push:
5+
pull_request:
66

77
jobs:
8-
rust:
9-
uses: FyraLabs/actions/.github/workflows/rust.yml@main
10-
with:
11-
test-container: '{"image": "ghcr.io/terrapkg/builder:f41"}'
12-
test-pre: dnf install -y libhelium-devel 'pkgconfig(gnome-desktop-4)' clang-devel gcc mold cmake
8+
rust:
9+
uses: FyraLabs/actions/.github/workflows/rust.yml@main
10+
with:
11+
test-container: '{"image": "ghcr.io/terrapkg/builder:f41"}'
12+
test-pre: dnf install -y libhelium-devel 'pkgconfig(gnome-desktop-4)' clang-devel gcc mold cmake cryptsetup

0 commit comments

Comments
 (0)