diff --git a/.github/workflows/fedora-40-package.yml b/.github/workflows/fedora-40-package.yml index cf955022eb..fc4fef8503 100644 --- a/.github/workflows/fedora-40-package.yml +++ b/.github/workflows/fedora-40-package.yml @@ -19,11 +19,11 @@ jobs: # if: github.ref != 'refs/heads/devel' # run: exit 1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@master + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@master - - name: Pull Fedora image - run: docker pull fedora:40 + - name: Pull Fedora image + run: docker pull fedora:40 - name: Set up GitHub CLI run: | @@ -36,20 +36,20 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Build RPM in Fedora container - run: | + run: | docker run --rm \ -v ${{ github.workspace }}:/workspace \ -w /workspace \ fedora:40 \ - bash -c " - dnf install -y rpm-build make gcc-c++ git python3-devel cmake gmp-devel libuuid-devel sqlite-devel gtkmm30-devel boost-devel python3-matplotlib python3-pip - pip3 install sympy - cd cadabra2 - mkdir build - cd build - cmake -DPACKAGING_MODE=ON -DENABLE_MATHEMATICA=OFF -DCMAKE_INSTALL_PREFIX=/usr .. - make - cpack + bash -c " \ + dnf install -y rpm-build make gcc-c++ git python3-devel cmake gmp-devel libuuid-devel sqlite-devel gtkmm30-devel boost-devel python3-matplotlib python3-pip \ + pip3 install sympy \ + cd cadabra2 \ + mkdir build \ + cd build \ + cmake -DPACKAGING_MODE=ON -DENABLE_MATHEMATICA=OFF -DCMAKE_INSTALL_PREFIX=/usr .. \ + make \ + cpack \ " - name: Set version variables from output of cmake @@ -59,7 +59,7 @@ jobs: - name: Upload Release Assets run: | - gh release upload "${{ env.VERSION }}" build/cadabra2-${{ env.VERSION }}-fedora-40.rpm --clobber + gh release upload "${{ env.VERSION }}" build/cadabra2-${{ env.VERSION }}-fedora40.rpm --clobber env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}