Skip to content

Commit 5ad440b

Browse files
authored
Merge pull request #46 from DataSQRL/dependabot/maven/org.codehaus.mojo-exec-maven-plugin-3.5.0
Bump org.codehaus.mojo:exec-maven-plugin from 3.0.0 to 3.5.0
2 parents 29a8969 + eaa1192 commit 5ad440b

File tree

3 files changed

+20
-16
lines changed

3 files changed

+20
-16
lines changed

.github/workflows/delete-pr-images.yml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,35 @@ jobs:
1515
steps:
1616
- name: Delete GHCR image
1717
run: |
18-
# Convert the repository name to lowercase for GHCR compatibility
19-
REPO=$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')
18+
set -x
2019
21-
# Our PR image tag is pr-<number>-<flink_profile>
20+
# Hardcoded GHCR image repository
21+
REPO="datasqrl/flink-sql-runner"
22+
23+
# PR image tag is pr-<number>-<flink_profile>
2224
TAG="pr-${{ github.event.number }}-${{ matrix.FLINK_PROFILE }}"
23-
IMAGE="ghcr.io/$REPO/flink-jar-runner:$TAG"
25+
IMAGE="ghcr.io/$REPO:$TAG"
2426
2527
echo "Attempting to delete image: $IMAGE"
2628
27-
# Build the Basic Auth header from your PAT credentials
29+
# Build Basic Auth header from PAT credentials
2830
TOKEN_BASE64="$(echo -n "${{ secrets.PAT_USERNAME }}:${{ secrets.PAT_PASSWORD }}" | base64)"
2931
30-
# Make a GET request (including multiple Accept types) to retrieve the Docker-Content-Digest header
31-
# We use '-sD -' to capture both headers and body in RAW_RESPONSE
32+
# Make GET request to fetch Docker-Content-Digest header
3233
RAW_RESPONSE=$(curl -sD - \
3334
-H "Authorization: Basic $TOKEN_BASE64" \
34-
-H "Accept: application/vnd.docker.distribution.manifest.list.v2+json, application/vnd.docker.distribution.manifest.v2+json, application/vnd.oci.image.manifest.v1+json, application/vnd.oci.image.index.v1+json" \
35-
"https://ghcr.io/v2/$REPO/flink-jar-runner/manifests/$TAG")
35+
-H "Accept: application/vnd.docker.distribution.manifest.list.v2+json,application/vnd.docker.distribution.manifest.v2+json,application/vnd.oci.image.manifest.v1+json,application/vnd.oci.image.index.v1+json" \
36+
"https://ghcr.io/v2/$REPO/manifests/$TAG")
37+
38+
# Output raw response for debugging
39+
echo "==== RAW RESPONSE START ===="
40+
echo "$RAW_RESPONSE"
41+
echo "==== RAW RESPONSE END ===="
3642
3743
# Separate headers from body
3844
HEADERS=$(echo "$RAW_RESPONSE" | sed -n '/^HTTP/,$p' | sed '/^$/q')
3945
40-
# Extract the Docker-Content-Digest from headers
46+
# Extract Docker-Content-Digest from headers
4147
DIGEST=$(echo "$HEADERS" | awk '/docker-content-digest:/ { print $2 }' | tr -d $'\r')
4248
4349
if [[ -z "$DIGEST" ]]; then
@@ -54,7 +60,7 @@ jobs:
5460
DELETE_STATUS=$(curl -s -o /dev/null -w "%{http_code}" \
5561
-X DELETE \
5662
-H "Authorization: Basic $TOKEN_BASE64" \
57-
"https://ghcr.io/v2/$REPO/flink-jar-runner/manifests/$DIGEST")
63+
"https://ghcr.io/v2/$REPO/manifests/$DIGEST")
5864
5965
if [[ "$DELETE_STATUS" -ge 200 && "$DELETE_STATUS" -lt 300 ]]; then
6066
echo "Image deleted successfully (HTTP $DELETE_STATUS)."

.github/workflows/uber-jar.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
FLINK_PROFILE: [flink-1.19, flink-1.20]
2424

2525
env:
26-
DOCKER_REPO: datasqrl/flink-jar-runner
2726
VERSION: ${{ github.event_name == 'release' && github.event.action == 'created' && github.ref_name || 'snapshot' }}
2827

2928
steps:
@@ -77,10 +76,9 @@ jobs:
7776
working-directory: ./flink-jar-runner/target/
7877
run: |
7978
if [[ "${{ github.event_name }}" == "pull_request" ]]; then
80-
REPO=$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')
81-
IMAGE=ghcr.io/$REPO/flink-jar-runner:pr-${{ github.event.number }}-${{ matrix.FLINK_PROFILE }}
79+
IMAGE=ghcr.io/datasqrl/flink-sql-runner:pr-${{ github.event.number }}-${{ matrix.FLINK_PROFILE }}
8280
else
83-
IMAGE=${{ env.DOCKER_REPO }}:${{ env.VERSION }}-${{ matrix.FLINK_PROFILE }}
81+
IMAGE=datasqrl/flink-jar-runner:${{ env.VERSION }}-${{ matrix.FLINK_PROFILE }}
8482
fi
8583
8684
echo "Building image: $IMAGE"

flink-jar-runner/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@
400400
<plugin>
401401
<groupId>org.codehaus.mojo</groupId>
402402
<artifactId>exec-maven-plugin</artifactId>
403-
<version>3.0.0</version>
403+
<version>3.5.0</version>
404404
<executions>
405405
<execution>
406406
<goals>

0 commit comments

Comments
 (0)