Skip to content

Commit

Permalink
format yaml, add cryptsetup to test flow
Browse files Browse the repository at this point in the history
  • Loading branch information
korewaChino committed Feb 15, 2025
1 parent 4b504db commit e8664d3
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 32 deletions.
50 changes: 25 additions & 25 deletions .github/workflows/rpmbuild-debug.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
on:
push:
pull_request:
push:
pull_request:

name: Build RPM snapshot package

jobs:
build:
runs-on: ubuntu-latest
container:
image: ghcr.io/terrapkg/builder:f41
steps:
- uses: actions/checkout@v4
build:
runs-on: ubuntu-latest
container:
image: ghcr.io/terrapkg/builder:f41
steps:
- uses: actions/checkout@v4

- name: Install dependencies
run: |
dnf4 up -y
dnf4 -y install dnf-plugins-core
# builddep is broken with dnf5 for some reason
dnf4 builddep -y ci/readymade.spec
dnf4 in -y rpmdevtools git rpm-build
- name: Install dependencies
run: |
dnf4 up -y
dnf4 -y install dnf-plugins-core
# builddep is broken with dnf5 for some reason
dnf4 builddep -y ci/readymade.spec
dnf4 in -y rpmdevtools git rpm-build
- name: run rpmbuild
run: |
git_sha=${{ github.sha }}
git_short=${git_sha:0:7}
rpmdev-setuptree
rpmbuild -ba ci/readymade.spec --define "gitcommit $git_sha" --define "shortcommit $git_short" --define "_rpmdir $PWD/build" --define "_disable_source_fetch 0"
- name: run rpmbuild
run: |
git_sha=${{ github.sha }}
git_short=${git_sha:0:7}
rpmdev-setuptree
rpmbuild -ba ci/readymade.spec --define "gitcommit $git_sha" --define "shortcommit $git_short" --define "_rpmdir $PWD/build" --define "_disable_source_fetch 0"
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
path: build/**/*.rpm
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
path: build/**/*.rpm
14 changes: 7 additions & 7 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: Rust

on:
push:
pull_request:
push:
pull_request:

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

0 comments on commit e8664d3

Please sign in to comment.