diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f9df2dd03ce..b2eb4d95fa1 100644 --- 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 index 695dea78b15..c26957abd58 100644 --- 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 index ff6d16da8b9..a471ad7a297 100644 --- 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 index 87eae784746..58cbd46de80 100644 --- 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 index e5617215273..827ecac5138 100644 --- 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