Skip to content

Fix new workflows #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattkjames7 merged 5 commits into from
Apr 25, 2025
Merged

Fix new workflows #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c380cc6
fix-s3-region
mattkjames7 Apr 25, 2025
b1a1447
fix name
mattkjames7 Apr 25, 2025
9229fc6
fix incorrect arch names
mattkjames7 Apr 25, 2025
d9f0747
fix cleanup
mattkjames7 Apr 25, 2025
74b5268
remove local manifest
mattkjames7 Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build_images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.s3_region }}
aws-region: "eu-west-1"

- name: Extract Tag From pyproject.toml
run: |
Expand All @@ -50,7 +50,7 @@ jobs:

- name: Set Name and Output Directory
run: |
name="mg-prometheus-exporter-${tag}${{ (matrix.arch == 'arm64') && '-arm64' || '' }}-docker.tar.gz"
name="mg-prometheus-exporter-${{ env.TAG }}${{ (matrix.arch == 'arm64') && '-arm64' || '' }}-docker.tar.gz"
echo "FILE_NAME=$name" >> $GITHUB_ENV

outdir="prometheus-exporter${{ inputs.test == true && '-test' || '' }}/v${{ env.TAG }}"
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/publish_images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ jobs:
- name: Setup Environment Variables
run: |
rc_dir="prometheus-exporter/v${{ inputs.version }}"
docker_tar_arm="mg-prometheus-exporter-${{ inputs.version }}-docker.tar.gz"
docker_tar_amd="mg-prometheus-exporter-${{ inputs.version }}-arm64-docker.tar.gz"
docker_tar_arm="mg-prometheus-exporter-${{ inputs.version }}-arm64-docker.tar.gz"
docker_tar_amd="mg-prometheus-exporter-${{ inputs.version }}-docker.tar.gz"

echo "rc_dir=${rc_dir}" >> $GITHUB_ENV
echo "docker_tar_arm=$docker_tar_arm" >> $GITHUB_ENV
Expand Down Expand Up @@ -77,6 +77,9 @@ jobs:

- name: Check if release image for this build already exists
run: |
# nuke any local manifest list so we truly query the registry
docker manifest rm "${release_image}" || true

existing_amd64=false
existing_arm64=false

Expand Down Expand Up @@ -126,6 +129,8 @@ jobs:
run: |
release_image_amd=${release_image}-amd64
release_image_arm=${release_image}-arm64
echo "release_image_amd=${release_image_amd}" >> $GITHUB_ENV
echo "release_image_arm=${release_image_arm}" >> $GITHUB_ENV
release_image_latest=${docker_repo_release}:latest

# Download and load, retag if necessary, push temporary arm64 image if available
Expand Down Expand Up @@ -183,14 +188,14 @@ jobs:
run: |
if [ "${has_rc_package_amd}" = "true" ]; then
echo "Deleting temporary image ${release_image_amd} ..."
curl -i -n -X DELETE -H "Authorization: JWT ${dockerhub_token}" https://hub.docker.com/v2/repositories/${docker_repo_release}/tags/${release_image#*:}-amd64/
curl -i -n -X DELETE -H "Authorization: JWT ${dockerhub_token}" https://hub.docker.com/v2/repositories/${docker_repo_release}/tags/${release_image_amd#*:}/
else
echo "Skipping deletion for amd64: image not promoted."
fi

if [ "${has_rc_package_arm}" = "true" ]; then
echo "Deleting temporary image ${release_image_arm} ..."
curl -i -n -X DELETE -H "Authorization: JWT ${dockerhub_token}" https://hub.docker.com/v2/repositories/${docker_repo_release}/tags/${release_image#*:}-arm64/
curl -i -n -X DELETE -H "Authorization: JWT ${dockerhub_token}" https://hub.docker.com/v2/repositories/${docker_repo_release}/tags/${release_image_arm#*:}/
else
echo "Skipping deletion for arm64: image not promoted."
fi
Expand Down