Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update RockyLinux image from 8 to 9 #2011

Merged
merged 1 commit into from
Aug 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Debian and RPM Package Builders
name: Debian Packages
permissions: read-all
on:
push:
Expand All @@ -7,9 +7,9 @@ on:
pull_request:
branches: [ main ]
jobs:
test-debian-packages:
test-packages:
if: github.event.pull_request
name: Test Debian Packages
name: Test Packages
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -28,9 +28,9 @@ jobs:
run: make debian-packages
- name: List generated files
run: ls -l *.deb
publish-debian-packages:
publish-packages:
if: ${{ ! github.event.pull_request }}
name: Publish Debian Packages
name: Publish Packages
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -53,31 +53,3 @@ jobs:
env:
FURY_TOKEN: ${{ secrets.FURY_TOKEN }}
run: for f in *.deb; do curl -F package=@$f https://[email protected]/miniflux/; done
test-rpm-package:
if: github.event.pull_request
name: Test RPM Package
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Build RPM Package
run: make rpm
- name: List generated files
run: ls -l *.rpm
publish-rpm-package:
if: ${{ ! github.event.pull_request }}
name: Publish RPM Package
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Build RPM Package
run: make rpm
- name: List generated files
run: ls -l *.rpm
- name: Upload package to repository
env:
FURY_TOKEN: ${{ secrets.FURY_TOKEN }}
run: for f in *.rpm; do curl -F package=@$f https://[email protected]/miniflux/; done
2 changes: 2 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
jobs:
test-docker-images:
if: github.event.pull_request
name: Test Images
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -35,6 +36,7 @@ jobs:

publish-docker-images:
if: ${{ ! github.event.pull_request }}
name: Publish Images
permissions:
packages: write
runs-on: ubuntu-latest
Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/rpm_packages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: RPM Packages
permissions: read-all
on:
push:
tags:
- '[0-9]+.[0-9]+.[0-9]+'
pull_request:
branches: [ main ]
jobs:
test-package:
if: github.event.pull_request
name: Test Packages
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Build RPM Package
run: make rpm
- name: List generated files
run: ls -l *.rpm
publish-package:
if: ${{ ! github.event.pull_request }}
name: Publish Packages
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Build RPM Package
run: make rpm
- name: List generated files
run: ls -l *.rpm
- name: Upload package to repository
env:
FURY_TOKEN: ${{ secrets.FURY_TOKEN }}
run: for f in *.rpm; do curl -F package=@$f https://[email protected]/miniflux/; done
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml → .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI Workflow
name: Tests
permissions: read-all

on:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export PGPASSWORD := postgres
debian-packages

miniflux:
@ go build -buildmode=pie -ldflags=$(LD_FLAGS) -o $(APP) main.go
@ CGO_ENABLED=0 go build -buildmode=pie -ldflags=$(LD_FLAGS) -o $(APP) main.go

linux-amd64:
@ CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-$@ main.go
Expand Down
4 changes: 2 additions & 2 deletions packaging/rpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ ADD . /go/src/app
WORKDIR /go/src/app
RUN make miniflux

FROM rockylinux:8
RUN dnf install -y rpm-build
FROM rockylinux:9
RUN dnf install -y rpm-build systemd
RUN mkdir -p /root/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
RUN echo "%_topdir /root/rpmbuild" >> .rpmmacros
COPY --from=build /go/src/app/miniflux /root/rpmbuild/SOURCES/miniflux
Expand Down
Loading