Skip to content

Commit 9fb449a

Browse files
author
Chris Nicel
authored
Merge pull request #25 from MasterOfMalt/PLOPS-923_Dependabot
Plops-923 fix deprecation warnings in projects that use these actions
2 parents 1761e9f + 32d0a6c commit 9fb449a

File tree

10 files changed

+8019
-1577
lines changed

10 files changed

+8019
-1577
lines changed

Docker_Image_Build/action.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ runs:
4848
echo "cache_setting=${{ inputs.cache_setting }}"
4949
echo "---"
5050
51-
- run: echo "::set-output name=image_name_tag::${{ inputs.registry }}${{ inputs.image_name }}:${{ inputs.tag_name }}"
51+
- run: echo "image_name_tag=${{ inputs.registry }}${{ inputs.image_name }}:${{ inputs.tag_name }}" >> "$GITHUB_OUTPUT"
5252
id: name_tag
5353
shell: bash
5454

@@ -58,4 +58,3 @@ runs:
5858
docker build . -f "${{ inputs.dockerfile }}" \
5959
-t "${{ inputs.registry }}${{ inputs.image_name }}:${{ inputs.tag_name }}" \
6060
"${{ inputs.cache_setting }}"
61-

Docker_Image_Cache/prepare_container_image_cache.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ echo "EXPIRY_TIME_IN_SECS=${EXPIRY_TIME_IN_SECS}"
2424
echo "---"
2525

2626
function prepare_cache_setting() {
27-
## Caching image layers is good - it saves build time, reduces storage and network usage.
28-
## However, we don't want to cache forever. For the pip packages that aren't pinned,
27+
## Caching image layers is good - it saves build time, reduces storage and network usage.
28+
## However, we don't want to cache forever. For the pip packages that aren't pinned,
2929
## we want it to fetch fresh ones regularly. Currently that is 3 days.
3030
## We avoid pinning unless necessary, so we don't end up dependant on ancient versions or afraid to update.
3131

@@ -67,14 +67,14 @@ function main() {
6767
elif docker pull "${image_name}:latest"; then
6868
image_full_name="${image_name}:latest"
6969
else
70-
echo "::set-output name=setting::--no-cache"
70+
echo "setting=--no-cache" >> "$GITHUB_OUTPUT"
7171
return
7272
fi
7373

7474
if prepare_cache_setting "${image_full_name}"; then
75-
echo "::set-output name=setting::--cache-from=${image_full_name}"
75+
echo "setting=--cache-from=${image_full_name}" >> "$GITHUB_OUTPUT"
7676
else
77-
echo "::set-output name=setting::--no-cache"
77+
echo "setting=--no-cache" >> "$GITHUB_OUTPUT"
7878
fi
7979
}
8080

Docker_Image_GetTag/get_git_tag.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [ "$REF" == 'refs/heads/master' ] || [ "$REF" == 'refs/heads/main' ] || [ "$R
1313
else
1414
tag_name="$(basename "$REF")"
1515
fi
16-
echo "::set-output name=tag_name::${tag_name}"
16+
echo "tag_name=${tag_name}" >> "$GITHUB_OUTPUT"
1717
echo "###################################"
1818
echo "Docker_Image_GetTag Output:"
1919
echo "---"

Git_Normalise_Tag/action.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ runs:
4646
DOT_COUNT=$(echo ${PREV_TAG} | tr -cd '.' | wc -c)
4747
case $DOT_COUNT in
4848
0)
49-
echo "::set-output name=new_tag::${PREV_TAG}.0.0"
49+
echo "new_tag=${PREV_TAG}.0.0" >> "$GITHUB_OUTPUT"
5050
;;
5151
1)
52-
echo "::set-output name=new_tag::${PREV_TAG}.0"
52+
echo "new_tag=${PREV_TAG}.0" >> "$GITHUB_OUTPUT"
5353
;;
5454
*)
5555
echo "Can't normalise this tag"
@@ -63,4 +63,3 @@ runs:
6363
git tag -a ${{ steps.normalise_tag.outputs.new_tag }} -m "Normalised to semantic-version format"
6464
git push origin --tags
6565
fi
66-

0 commit comments

Comments
 (0)