From 621ee195719d1a5f1c7796a8dfcefb77ecd50a5a Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Fri, 22 Nov 2024 18:32:06 -0700 Subject: [PATCH 1/5] Require gpgme-devel even when not building the API Signed-off-by: Jonathon Anderson --- warewulf.spec.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/warewulf.spec.in b/warewulf.spec.in index dae40912..9473a52c 100644 --- a/warewulf.spec.in +++ b/warewulf.spec.in @@ -71,8 +71,9 @@ Requires: dhcp BuildRequires: git BuildRequires: make +BuildRequires: gpgme-devel %if %{api} -BuildRequires: libassuan-devel gpgme-devel +BuildRequires: libassuan-devel %endif Recommends: logrotate From ab1fca4872bb5a5cc2522367a06b0f47193c1b84 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Fri, 22 Nov 2024 20:20:16 -0700 Subject: [PATCH 2/5] Upgrade actions/download-artifact to v4 Signed-off-by: Jonathon Anderson --- .github/actions/rpm/action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/rpm/action.yml b/.github/actions/rpm/action.yml index 66fa3fd8..454f7474 100644 --- a/.github/actions/rpm/action.yml +++ b/.github/actions/rpm/action.yml @@ -35,7 +35,7 @@ runs: shell: bash - name: Download spec - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: warewulf.spec @@ -45,7 +45,7 @@ runs: shell: bash - name: Download dist - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: warewulf-${{ env.EXPECTED_VERSION }}.tar.gz @@ -93,4 +93,4 @@ runs: with: release_id: ${{ inputs.event-id }} file: " warewulf-${{ env.EXPECTED_VERSION }}.tar.gz;/var/lib/mock/${{ inputs.target }}/result/${{ env.RPM }};/var/lib/mock/${{ inputs.target }}/result/${{ env.SRPM }};/var/lib/mock/${{ inputs.target }}/result/${{ env.DRACUT }}" - overwrite: true \ No newline at end of file + overwrite: true From a68e4b05cecea82edae43b581b48c88601473b84 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Fri, 22 Nov 2024 20:21:37 -0700 Subject: [PATCH 3/5] Upgrade actions/upload-artifact to v4 Signed-off-by: Jonathon Anderson --- .github/actions/generate/action.yml | 4 ++-- .github/actions/rpm/action.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/generate/action.yml b/.github/actions/generate/action.yml index 935ab0b1..3c64063e 100644 --- a/.github/actions/generate/action.yml +++ b/.github/actions/generate/action.yml @@ -74,14 +74,14 @@ runs: - name: Upload warewulf.spec if: steps.should-continue.outputs.continue == 'true' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: warewulf.spec path: warewulf.spec - name: Upload DIST if: steps.should-continue.outputs.continue == 'true' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.DIST }} path: ${{ env.DIST }} diff --git a/.github/actions/rpm/action.yml b/.github/actions/rpm/action.yml index 454f7474..a0c7d100 100644 --- a/.github/actions/rpm/action.yml +++ b/.github/actions/rpm/action.yml @@ -68,19 +68,19 @@ runs: shell: bash - name: Upload RPM - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.RPM }} path: /var/lib/mock/${{ inputs.target }}/result/${{ env.RPM }} - name: Upload SRPM - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.SRPM }} path: /var/lib/mock/${{ inputs.target }}/result/${{ env.SRPM }} - name: Upload dracut RPM - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.DRACUT }} path: /var/lib/mock/${{ inputs.target }}/result/${{ env.DRACUT }} From f3c74e4408157a5cf43d4977b02f6b0055d61dc8 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Fri, 22 Nov 2024 20:23:20 -0700 Subject: [PATCH 4/5] Upgrade actions/setup-go to v5 Signed-off-by: Jonathon Anderson --- .github/actions/prepare/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/prepare/action.yml b/.github/actions/prepare/action.yml index 4ddca7c0..905a2cf3 100644 --- a/.github/actions/prepare/action.yml +++ b/.github/actions/prepare/action.yml @@ -17,7 +17,7 @@ runs: shell: bash - name: Setup go ${{ inputs.go-version }} - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: ${{ inputs.go-version }} cache: true From 500f9ebfb771af6b45a47e22ae2bb6d863d7b25b Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Fri, 22 Nov 2024 20:24:24 -0700 Subject: [PATCH 5/5] Upgrade actions/setup-python to v5 Signed-off-by: Jonathon Anderson --- .github/workflows/documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index dfa86e6f..82ff13ca 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -38,7 +38,7 @@ jobs: sudo apt-get install -f -y graphviz - name: Setup Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 - name: Install Sphinx run: |