diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 49ba564c..38d73851 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -9,7 +9,7 @@ jobs: if: ${{ github.repository_owner == 'hcpng' }} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: recursive diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 79550f57..255be759 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -14,7 +14,7 @@ jobs: matrix: # Pin go version to the one(s) below. go: [ '1.17' ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup go ${{ matrix.go }} uses: actions/setup-go@v3 diff --git a/.github/workflows/releasebuild.yml b/.github/workflows/releasebuild.yml index 6e25de75..c0841b9b 100644 --- a/.github/workflows/releasebuild.yml +++ b/.github/workflows/releasebuild.yml @@ -22,7 +22,7 @@ jobs: echo "SRC=${GITHUB_REF}" >> $GITHUB_ENV - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install Go uses: actions/setup-go@v3 @@ -74,23 +74,23 @@ jobs: - name: Run rpm build script run: ./mockbuild.sh ${{ env.VERSION }} - - name: Upload EL8 RPM + - name: Upload EL8 RPMs uses: actions/upload-artifact@v3 with: - name: warewulf-${{ env.VERSION }}-${{ env.RELEASE }}.el8.x86_64.rpm - path: warewulf-${{ env.VERSION }}-${{ env.RELEASE }}.el8.x86_64.rpm + name: warewulf-${{ env.VERSION }}-${{ env.RELEASE }}.el8 + path: warewulf-${{ env.VERSION }}-${{ env.RELEASE }}.el8.*.rpm - - name: Upload EL7 RPM + - name: Upload EL7 RPMs uses: actions/upload-artifact@v3 with: - name: warewulf-${{ env.VERSION }}-${{ env.RELEASE }}.el7.x86_64.rpm - path: warewulf-${{ env.VERSION }}-${{ env.RELEASE }}.el7.x86_64.rpm + name: warewulf-${{ env.VERSION }}-${{ env.RELEASE }}.el7 + path: warewulf-${{ env.VERSION }}-${{ env.RELEASE }}.el7.*.rpm - - name: Upload openSUSE Leap 15.3 RPM + - name: Upload openSUSE Leap 15.3 RPMs uses: actions/upload-artifact@v3 with: - name: warewulf-${{ env.VERSION }}-${{ env.RELEASE }}.suse.lp153.x86_64.rpm - path: warewulf-${{ env.VERSION }}-${{ env.RELEASE }}.suse.lp153.x86_64.rpm + name: warewulf-${{ env.VERSION }}-${{ env.RELEASE }}.suse.lp153 + path: warewulf-${{ env.VERSION }}-${{ env.RELEASE }}.suse.lp153.*.rpm - name: Upload Assets To Release if: "!github.event.release.prerelease" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index abf4e496..bc829b3d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: matrix: go: [ '1.17', '1.18', '1.19' ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install gpgme run: sudo apt-get install libgpgme-dev diff --git a/ci/mockbuild.sh b/ci/mockbuild.sh index 8d05fd04..c068d71d 100644 --- a/ci/mockbuild.sh +++ b/ci/mockbuild.sh @@ -12,9 +12,12 @@ echo RELEASE=${RELEASE} >> $GITHUB_ENV mock -r rocky+epel-8-x86_64 --rebuild --spec=warewulf-${VERSION}/warewulf.spec --sources=. mv /var/lib/mock/rocky+epel-8-x86_64/result/warewulf-${VERSION}-${RELEASE}.el8.x86_64.rpm . +mv /var/lib/mock/rocky+epel-8-x86_64/result/warewulf-${VERSION}-${RELEASE}.el8.src.rpm . mock -r centos+epel-7-x86_64 --rebuild --spec=warewulf-${VERSION}/warewulf.spec --sources=. mv /var/lib/mock/centos+epel-7-x86_64/result/warewulf-${VERSION}-${RELEASE}.el7.x86_64.rpm . +mv /var/lib/mock/centos+epel-7-x86_64/result/warewulf-${VERSION}-${RELEASE}.el7.src.rpm . mock -r opensuse-leap-15.3-x86_64 --rebuild --spec=warewulf-${VERSION}/warewulf.spec --sources=. -mv /var/lib/mock/opensuse-leap-15.3-x86_64/result/warewulf-${VERSION}-${RELEASE}.suse.lp153.x86_64.rpm . \ No newline at end of file +mv /var/lib/mock/opensuse-leap-15.3-x86_64/result/warewulf-${VERSION}-${RELEASE}.suse.lp153.x86_64.rpm . +mv /var/lib/mock/opensuse-leap-15.3-x86_64/result/warewulf-${VERSION}-${RELEASE}.suse.lp153.src.rpm .