Properly handle reuploads of packages to PackageCloud. (#11427)
This properly uses only the file name instead of the full path when attempting to delete packages on PackageCloud in preparation for uploading new ones.
Austin S. Hemmelgarn committed
Aug 11, 2021 at 13:24 UTC
f7b56a5f15d0a87fe3c8be7dc3030e30ad2f6abb
2 files changed
+4
-4
.github/workflows/packaging.yml
+1
-1
@@ -123,7 +123,7 @@ jobs:
123
run: |
124
echo "Packages to upload:\n$(ls artifacts/*.${{ matrix.format }})"
125
for pkgfile in artifacts/*.${{ matrix.format }} ; do
126
- .github/scripts/package_cloud_wrapper.sh yank ${{ env.repo }}/${{ matrix.pkgclouddistro }} ${pkgfile} || true
126
+ .github/scripts/package_cloud_wrapper.sh yank ${{ env.repo }}/${{ matrix.pkgclouddistro }} $(basename ${pkgfile}) || true
127
.github/scripts/package_cloud_wrapper.sh push ${{ env.repo }}/${{ matrix.pkgclouddistro }} ${pkgfile}
128
done
129
- name: Clean
.github/workflows/repoconfig-packages.yml
+3
-3
@@ -48,11 +48,11 @@ jobs:
48
run: |
49
echo "Packages to upload:\n$(ls artifacts/*.${{ matrix.format }})"
50
for pkgfile in artifacts/*.${{ matrix.format }} ; do
51
- .github/scripts/package_cloud_wrapper.sh yank ${{ secrets.PACKAGE_CLOUD_REPO }}/${{ matrix.pkgclouddistro }} ${pkgfile} || true
51
+ .github/scripts/package_cloud_wrapper.sh yank ${{ secrets.PACKAGE_CLOUD_REPO }}/${{ matrix.pkgclouddistro }} $(basename ${pkgfile}) || true
52
.github/scripts/package_cloud_wrapper.sh push ${{ secrets.PACKAGE_CLOUD_REPO }}/${{ matrix.pkgclouddistro }} ${pkgfile}
53
- .github/scripts/package_cloud_wrapper.sh yank ${{ secrets.PACKAGE_CLOUD_REPO }}-edge/${{ matrix.pkgclouddistro }} ${pkgfile} || true
53
+ .github/scripts/package_cloud_wrapper.sh yank ${{ secrets.PACKAGE_CLOUD_REPO }}-edge/${{ matrix.pkgclouddistro }} $(basename ${pkgfile}) || true
54
.github/scripts/package_cloud_wrapper.sh push ${{ secrets.PACKAGE_CLOUD_REPO }}-edge/${{ matrix.pkgclouddistro }} ${pkgfile}
55
- .github/scripts/package_cloud_wrapper.sh yank ${{ secrets.PACKAGE_CLOUD_REPO }}-repoconfig/${{ matrix.pkgclouddistro }} ${pkgfile} || true
55
+ .github/scripts/package_cloud_wrapper.sh yank ${{ secrets.PACKAGE_CLOUD_REPO }}-repoconfig/${{ matrix.pkgclouddistro }} $(basename ${pkgfile}) || true
56
.github/scripts/package_cloud_wrapper.sh push ${{ secrets.PACKAGE_CLOUD_REPO }}-repoconfig/${{ matrix.pkgclouddistro }} ${pkgfile}
57
done
58
- name: Failure Notification