Update workflow files

makedeb · Oct 12, 2024 · 89633d5 · 89633d5
1 parent d4c8244
commit 89633d5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/get-update-targets/action.yml b/.github/workflows/get-update-targets/action.yml
@@ -37,6 +37,10 @@ runs:
       id: list-targets
       shell: bash
       run: |
+        if [[ "${{ runner.debug }}" == '1' ]]; then
+          set -x
+        fi
+
         # Convert the packages listing into JSON.
         sudo apt-get install dasel -y
         pkg_list="$(curl -L 'https://github.com/makedeb/prebuilt-mpr/raw/main/packages.toml' | dasel -r toml -w json)"
@@ -64,7 +68,7 @@ runs:
 
         # If we're packaging for `dasel` we have to uninstall it, as it'll mess with our checks below otherwise.
         if [[ "${{ inputs.pkgbase }}" == 'dasel' ]]; then
-          sudo apt-get uninstall dasel -y
+          sudo apt-get purge dasel -y
         fi
 
         # We overwrite files in /etc/apt during this, so backup the directory for restoration after we're done.
@@ -76,7 +80,7 @@ runs:
 
         # Set up needed variables.
         LATEST_VERSION="$(curl -s 'https://mpr.${{ inputs.makedeb_url }}/packages-meta-ext-v2.json.gz' | jq -r '.[] | select(.PackageBase=="${{ inputs.pkgbase }}").Version')"
-        DISTROS=('focal' 'jammy' 'lunar' 'mantic' 'noble' 'bullseye' 'bookworm')
+        DISTROS=('focal' 'jammy' 'lunar' 'mantic' 'noble' 'oracular' 'bullseye' 'bookworm')
         ARCHS=('amd64' 'arm64')
         OUTPUT='[]'
 
@@ -139,13 +143,13 @@ runs:
             fi
 
             # The package lines.
-            mapfile -t apt_output < <(apt list '${{ inputs.pkgbase }}' 2> /dev/null | grep '^[a-z/]* ')
+            mapfile -t apt_output < <(apt list '${{ inputs.pkgbase }}' 2> /dev/null | grep '^[a-z/,-]* ')
 
             apt_version="$(echo "${apt_output[0]}" | awk '{print $2}')"
 
             if [[ "${apt_version}" != "${LATEST_VERSION}" ]]; then
               case "${distro}" in
-                focal|jammy|lunar|mantic|noble) tag="ubuntu-${distro}" ;;
+                focal|jammy|lunar|mantic|noble|oracular) tag="ubuntu-${distro}" ;;
                 bullseye|bookworm) tag="debian-${distro}" ;;
               esac
 

diff --git a/.github/workflows/publish-pkg.yml b/.github/workflows/publish-pkg.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Install ProGet CLI
         run: sudo apt-get install pg -y
       - name: Download artifacts
-        uses: dawidd6/action-download-artifact@v3
+        uses: dawidd6/action-download-artifact@v6
         with:
           pr: "${{ github.event.pull_request.number }}"
           workflow: build-pkg.yml