Skip to content

Commit 4b9a31f

Browse files
R1kaB3rNR1kaB3rN
authored
workflows: fix noarch (#372)
1 parent e7e27f6 commit 4b9a31f

File tree

3 files changed

+66
-69
lines changed

3 files changed

+66
-69
lines changed

‎.github/workflows/build-umu-fedora-40.yml

+31-32
Original file line numberDiff line numberDiff line change
@@ -10,42 +10,41 @@ on:
1010
required: true
1111
type: string
1212

13-
1413
jobs:
1514
build:
1615
runs-on: ubuntu-latest
1716
container:
1817
image: fedora:40
1918

2019
steps:
21-
- name: Install Git
22-
run: dnf install -y git
23-
24-
- name: Checkout repository
25-
uses: actions/checkout@v4
26-
27-
- name: Configure Git safe directory
28-
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
29-
30-
- name: Install build dependencies
31-
run: dnf install -y rpm-build meson ninja-build cmake g++ gcc-c++ scdoc git python3-devel python3-build python3-installer python3-hatchling python python3 cargo python3-hatch-vcs python3-wheel libzstd-devel
32-
33-
- name: Build the project
34-
run: |
35-
git submodule update --init --recursive
36-
./configure.sh --prefix=/usr
37-
make
38-
mkdir -p ~/rpmbuild/SOURCES
39-
cp -r . ~/rpmbuild/SOURCES/umu-launcher
40-
sed -re 's|(Version:\s+)[1-9.]+|\1${{ inputs.version }}|g' -i packaging/rpm/umu-launcher.spec
41-
sed -re 's|(%define tag\s+)[1-9.]+|\1${{ inputs.version }}|g' -i packaging/rpm/umu-launcher.spec
42-
sed -re 's|(%define manual_commit\s+)\w+|\1${{ inputs.shasum }}|g' -i packaging/rpm/umu-launcher.spec
43-
rpmbuild -ba packaging/rpm/umu-launcher.spec
44-
mv ~/rpmbuild/RPMS/x86_64/umu-launcher-${{ inputs.version }}*.rpm \
45-
~/rpmbuild/RPMS/x86_64/umu-launcher-${{ inputs.version }}.fc40.noarch.rpm
46-
47-
- name: Fedora-40
48-
uses: actions/upload-artifact@v4
49-
with:
50-
name: umu-launcher-${{ inputs.version }}.fc40.noarch.rpm
51-
path: ~/rpmbuild/RPMS/x86_64/umu-launcher-${{ inputs.version }}.fc40.noarch.rpm
20+
- name: Install Git
21+
run: dnf install -y git
22+
23+
- name: Checkout repository
24+
uses: actions/checkout@v4
25+
26+
- name: Configure Git safe directory
27+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
28+
29+
- name: Install build dependencies
30+
run: dnf install -y rpm-build meson ninja-build cmake g++ gcc-c++ scdoc git python3-devel python3-build python3-installer python3-hatchling python python3 cargo python3-hatch-vcs python3-wheel libzstd-devel
31+
32+
- name: Build the project
33+
run: |
34+
git submodule update --init --recursive
35+
./configure.sh --prefix=/usr
36+
make
37+
mkdir -p ~/rpmbuild/SOURCES
38+
cp -r . ~/rpmbuild/SOURCES/umu-launcher
39+
sed -re 's|(Version:\s+)[1-9.]+|\1${{ inputs.version }}|g' -i packaging/rpm/umu-launcher.spec
40+
sed -re 's|(%define tag\s+)[1-9.]+|\1${{ inputs.version }}|g' -i packaging/rpm/umu-launcher.spec
41+
sed -re 's|(%define manual_commit\s+)\w+|\1${{ inputs.shasum }}|g' -i packaging/rpm/umu-launcher.spec
42+
rpmbuild -ba packaging/rpm/umu-launcher.spec
43+
mv ~/rpmbuild/RPMS/x86_64/umu-launcher-${{ inputs.version }}*.rpm \
44+
~/rpmbuild/RPMS/x86_64/umu-launcher-${{ inputs.version }}.fc40.rpm
45+
46+
- name: Fedora-40
47+
uses: actions/upload-artifact@v4
48+
with:
49+
name: umu-launcher-${{ inputs.version }}.fc40.rpm
50+
path: ~/rpmbuild/RPMS/x86_64/umu-launcher-${{ inputs.version }}.fc40.rpm

‎.github/workflows/build-umu-fedora-41.yml

+31-32
Original file line numberDiff line numberDiff line change
@@ -10,42 +10,41 @@ on:
1010
required: true
1111
type: string
1212

13-
1413
jobs:
1514
build:
1615
runs-on: ubuntu-latest
1716
container:
1817
image: fedora:41
1918

2019
steps:
21-
- name: Install Git
22-
run: dnf install -y git
23-
24-
- name: Checkout repository
25-
uses: actions/checkout@v4
26-
27-
- name: Configure Git safe directory
28-
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
29-
30-
- name: Install build dependencies
31-
run: dnf install -y rpm-build meson ninja-build cmake g++ gcc-c++ scdoc git python3-devel python3-build python3-installer python3-hatchling python python3 cargo python3-hatch-vcs python3-wheel libzstd-devel
32-
33-
- name: Build the project
34-
run: |
35-
git submodule update --init --recursive
36-
./configure.sh --prefix=/usr
37-
make
38-
mkdir -p ~/rpmbuild/SOURCES
39-
cp -r . ~/rpmbuild/SOURCES/umu-launcher
40-
sed -re 's|(Version:\s+)[1-9.]+|\1${{ inputs.version }}|g' -i packaging/rpm/umu-launcher.spec
41-
sed -re 's|(%define tag\s+)[1-9.]+|\1${{ inputs.version }}|g' -i packaging/rpm/umu-launcher.spec
42-
sed -re 's|(%define manual_commit\s+)\w+|\1${{ inputs.shasum }}|g' -i packaging/rpm/umu-launcher.spec
43-
rpmbuild -ba packaging/rpm/umu-launcher.spec
44-
mv ~/rpmbuild/RPMS/x86_64/umu-launcher-${{ inputs.version }}*.rpm \
45-
~/rpmbuild/RPMS/x86_64/umu-launcher-${{ inputs.version }}.fc41.noarch.rpm
46-
47-
- name: Fedora-41
48-
uses: actions/upload-artifact@v4
49-
with:
50-
name: umu-launcher-${{ inputs.version }}.fc41.noarch.rpm
51-
path: ~/rpmbuild/RPMS/x86_64/umu-launcher-${{ inputs.version }}.fc41.noarch.rpm
20+
- name: Install Git
21+
run: dnf install -y git
22+
23+
- name: Checkout repository
24+
uses: actions/checkout@v4
25+
26+
- name: Configure Git safe directory
27+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
28+
29+
- name: Install build dependencies
30+
run: dnf install -y rpm-build meson ninja-build cmake g++ gcc-c++ scdoc git python3-devel python3-build python3-installer python3-hatchling python python3 cargo python3-hatch-vcs python3-wheel libzstd-devel
31+
32+
- name: Build the project
33+
run: |
34+
git submodule update --init --recursive
35+
./configure.sh --prefix=/usr
36+
make
37+
mkdir -p ~/rpmbuild/SOURCES
38+
cp -r . ~/rpmbuild/SOURCES/umu-launcher
39+
sed -re 's|(Version:\s+)[1-9.]+|\1${{ inputs.version }}|g' -i packaging/rpm/umu-launcher.spec
40+
sed -re 's|(%define tag\s+)[1-9.]+|\1${{ inputs.version }}|g' -i packaging/rpm/umu-launcher.spec
41+
sed -re 's|(%define manual_commit\s+)\w+|\1${{ inputs.shasum }}|g' -i packaging/rpm/umu-launcher.spec
42+
rpmbuild -ba packaging/rpm/umu-launcher.spec
43+
mv ~/rpmbuild/RPMS/x86_64/umu-launcher-${{ inputs.version }}*.rpm \
44+
~/rpmbuild/RPMS/x86_64/umu-launcher-${{ inputs.version }}.fc41.rpm
45+
46+
- name: Fedora-41
47+
uses: actions/upload-artifact@v4
48+
with:
49+
name: umu-launcher-${{ inputs.version }}.fc41.rpm
50+
path: ~/rpmbuild/RPMS/x86_64/umu-launcher-${{ inputs.version }}.fc41.rpm

‎.github/workflows/release.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
uses: ./.github/workflows/build-umu-publish-release.yml
1818
with:
1919
version: ${{ github.ref_name }}
20-
file1: umu-launcher-${{ github.ref_name }}.fc40.noarch.rpm
21-
name1: umu-launcher-${{ github.ref_name }}.fc40.noarch.rpm
20+
file1: umu-launcher-${{ github.ref_name }}.fc40.rpm
21+
name1: umu-launcher-${{ github.ref_name }}.fc40.rpm
2222

2323
fedora41-build:
2424
name: Fedora 41 Build
@@ -32,8 +32,8 @@ jobs:
3232
uses: ./.github/workflows/build-umu-publish-release.yml
3333
with:
3434
version: ${{ github.ref_name }}
35-
file1: umu-launcher-${{ github.ref_name }}.fc41.noarch.rpm
36-
name1: umu-launcher-${{ github.ref_name }}.fc41.noarch.rpm
35+
file1: umu-launcher-${{ github.ref_name }}.fc41.rpm
36+
name1: umu-launcher-${{ github.ref_name }}.fc41.rpm
3737

3838
debian12-build:
3939
name: Debian 12 Build
@@ -80,4 +80,3 @@ jobs:
8080
version: ${{ github.ref_name }}
8181
file1: umu-launcher-${{ github.ref_name }}-zipapp.tar.gz
8282
name1: umu-launcher-${{ github.ref_name }}-zipapp.tar.gz
83-

0 commit comments

Comments
 (0)