Merge branch 'main' into noang

miniflux · Dec 23, 2024 · a0b98c2 · a0b98c2
2 parents fd6f383 + f52411f
commit a0b98c2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -22,8 +22,6 @@ jobs:
 
     strategy:
       fail-fast: false
-      matrix:
-        language: [ 'go', 'javascript' ]
 
     steps:
     - name: Checkout repository

diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -29,7 +29,6 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: "1.23.x"
-      - run: "go vet ./..."
       - uses: golangci/golangci-lint-action@v6
         with:
           args: >

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -23,8 +23,12 @@ jobs:
         go-version: ${{ matrix.go-version }}
     - name: Checkout
       uses: actions/checkout@v4
-    - name: Run unit tests
+    - name: Run unit tests with coverage and race conditions checking
+      if: matrix.os == 'ubuntu-latest'
       run: make test
+    - name: Run unit tests without coverage and race conditions checking
+      if: matrix.os != 'ubuntu-latest'
+      run: go test -count=1 ./...
 
   integration-tests:
     name: Integration Tests

diff --git a/packaging/rpm/Dockerfile b/packaging/rpm/Dockerfile
@@ -5,7 +5,7 @@ WORKDIR /go/src/app
 RUN make miniflux
 
 FROM rockylinux:9
-RUN dnf install -y rpm-build systemd
+RUN dnf install --setopt=install_weak_deps=False -y rpm-build systemd-rpm-macros
 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

diff --git a/packaging/rpm/miniflux.spec b/packaging/rpm/miniflux.spec
@@ -16,8 +16,7 @@ BuildRoot: %{_topdir}/BUILD/%{name}-%{version}-%{release}
 BuildArch: x86_64
 Requires(pre): shadow-utils
 
-%{?systemd_requires}
-BuildRequires: systemd
+%{?systemd_ordering}
 
 AutoReqProv: no