Fix handling of repository name in CI workflows. (#12234)
Austin S. Hemmelgarn committed
Feb 24, 2022 at 11:39 UTC
df3e7343e3d5c672c55459c132bc88949465b6fc
2 files changed
+11
-9
.github/workflows/packaging.yml
+4
-3
@@ -20,6 +20,7 @@ on:
20
required: false
21
env:
22
DISABLE_TELEMETRY: 1
23
+ REPO_PREFIX: netdata/netdata
24
concurrency:
25
group: packages-${{ github.ref }}-${{ github.event_name }}
26
cancel-in-progress: true
@@ -114,17 +115,17 @@ jobs:
115
if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
116
case "${{ github.event.inputs.type }}" in
117
"release")
117
- echo "::set-output name=repo::${{ secrets.PACKAGE_CLOUD_REPO }}"
118
+ echo "::set-output name=repo::${REPO_PREFIX}"
119
echo "::set-output name=version::${{ github.event.inputs.version }}"
120
echo "::set-output name=retention::365"
121
;;
122
"nightly")
122
- echo "::set-output name=repo::${{ secrets.PACKAGE_CLOUD_REPO }}-edge"
123
+ echo "::set-output name=repo::${REPO_PREFIX}-edge"
124
echo "::set-output name=version::${{ github.event.inputs.version }}"
125
echo "::set-output name=retention::30"
126
;;
127
*)
127
- echo "::set-output name=repo::${{ secrets.PACKAGE_CLOUD_REPO }}-devel"
128
+ echo "::set-output name=repo::${REPO_PREFIX}-devel"
129
echo "::set-output name=version::0.${GITHUB_SHA}"
130
echo "::set-output name=retention::30"
131
;;
.github/workflows/repoconfig-packages.yml
+7
-6
@@ -15,6 +15,7 @@ on:
15
- .github/workflows/repoconfig-packages.yml
16
env:
17
DISABLE_TELEMETRY: 1
18
+ REPO_PREFIX: netdata/netdata
19
jobs:
20
matrix:
21
name: Prepare Build Matrix
@@ -121,15 +122,15 @@ jobs:
122
run: |
123
printf "Packages to upload:\n%s" "$(ls artifacts/*.${{ matrix.format }})"
124
for pkgfile in artifacts/*.${{ matrix.format }} ; do
124
- .github/scripts/package_cloud_wrapper.sh yank ${{ secrets.PACKAGE_CLOUD_REPO }}/${{ matrix.pkgclouddistro }} \
125
+ .github/scripts/package_cloud_wrapper.sh yank "${REPO_PREFIX}/${{ matrix.pkgclouddistro }}" \
126
"$(basename "${pkgfile}")" || true
126
- .github/scripts/package_cloud_wrapper.sh push ${{ secrets.PACKAGE_CLOUD_REPO }}/${{ matrix.pkgclouddistro }} "${pkgfile}"
127
- .github/scripts/package_cloud_wrapper.sh yank ${{ secrets.PACKAGE_CLOUD_REPO }}-edge/${{ matrix.pkgclouddistro }} \
127
+ .github/scripts/package_cloud_wrapper.sh push "${REPO_PREFIX}/${{ matrix.pkgclouddistro }}" "${pkgfile}"
128
+ .github/scripts/package_cloud_wrapper.sh yank "${REPO_PREFIX}-edge/${{ matrix.pkgclouddistro }}" \
129
"$(basename "${pkgfile}")" || true
129
- .github/scripts/package_cloud_wrapper.sh push ${{ secrets.PACKAGE_CLOUD_REPO }}-edge/${{ matrix.pkgclouddistro }} "${pkgfile}"
130
- .github/scripts/package_cloud_wrapper.sh yank ${{ secrets.PACKAGE_CLOUD_REPO }}-repoconfig/${{ matrix.pkgclouddistro }} \
130
+ .github/scripts/package_cloud_wrapper.sh push "${REPO_PREFIX}-edge/${{ matrix.pkgclouddistro }}" "${pkgfile}"
131
+ .github/scripts/package_cloud_wrapper.sh yank "${REPO_PREFIX}-repoconfig/${{ matrix.pkgclouddistro }}" \
132
"$(basename "${pkgfile}")" || true
132
- .github/scripts/package_cloud_wrapper.sh push ${{ secrets.PACKAGE_CLOUD_REPO }}-repoconfig/${{ matrix.pkgclouddistro }} "${pkgfile}"
133
+ .github/scripts/package_cloud_wrapper.sh push "${REPO_PREFIX}-repoconfig/${{ matrix.pkgclouddistro }}" "${pkgfile}"
134
done
135
- name: Failure Notification
136
if: ${{ failure() }}