Skip to content

Commit

Permalink
change set-output to GITHUB_OUTPUT env variable, update actions/cache
Browse files Browse the repository at this point in the history
  • Loading branch information
stojanovskis1 committed Mar 5, 2024
1 parent 11e1e0b commit b3fec78
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/master_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
password: ${{ secrets.CR_PAT }}

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
/tmp/.buildx-cache-alpine-2-10
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Get docker tag for Alpine image
id: alpine
run: |
echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.10/Dockerfile)"
echo "IMAGE_TAG=$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.10/Dockerfile)" >> $GITHUB_OUTPUT
- name: Build and push CKAN 2.10 alpine
uses: docker/build-push-action@v5
Expand All @@ -57,7 +57,7 @@ jobs:
- name: Get docker tag for Ubuntu image
id: ubuntu
run: |
echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.10/Dockerfile.focal)"
echo "IMAGE_TAG=$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.10/Dockerfile.focal)" >> $GITHUB_OUTPUT
- name: Build and push CKAN 2.10 ubuntu
uses: docker/build-push-action@v5
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
password: ${{ secrets.CR_PAT }}

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
/tmp/.buildx-cache-alpine-2-9
Expand All @@ -105,7 +105,7 @@ jobs:
- name: Get docker tag for Alpine image
id: alpine
run: |
echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.9/Dockerfile)"
echo "IMAGE_TAG=$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.9/Dockerfile)" >> $GITHUB_OUTPUT
- name: Build and push CKAN 2.9 alpine
uses: docker/build-push-action@v5
Expand All @@ -122,7 +122,7 @@ jobs:
- name: Get docker tag for Ubuntu image
id: ubuntu
run: |
echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.9/Dockerfile.focal)"
echo "IMAGE_TAG=$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.9/Dockerfile.focal)" >> $GITHUB_OUTPUT
- name: Build and push CKAN 2.9 ubuntu
uses: docker/build-push-action@v5
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
password: ${{ secrets.CR_PAT }}

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
/tmp/.buildx-cache-alpine-2-8
Expand All @@ -170,7 +170,7 @@ jobs:
- name: Get docker tag for Alpine image
id: alpine
run: |
echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.8/Dockerfile)"
echo "IMAGE_TAG=$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.8/Dockerfile)" >> $GITHUB_OUTPUT
- name: Build and push CKAN 2.8 alpine
uses: docker/build-push-action@v5
Expand All @@ -187,7 +187,7 @@ jobs:
- name: Get docker tag for Ubuntu image
id: ubuntu
run: |
echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.8/Dockerfile.focal)"
echo "IMAGE_TAG=$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.8/Dockerfile.focal)" >> $GITHUB_OUTPUT
- name: Build and push CKAN 2.8 ubuntu
uses: docker/build-push-action@v5
Expand Down Expand Up @@ -223,7 +223,7 @@ jobs:
password: ${{ secrets.CR_PAT }}

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
/tmp/.buildx-cache-alpine-2-7
Expand All @@ -235,7 +235,7 @@ jobs:
- name: Get docker tag for Alpine image
id: alpine
run: |
echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.7/Dockerfile)"
echo "IMAGE_TAG=$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.7/Dockerfile)" >> $GITHUB_OUTPUT
- name: Build and push CKAN 2.7 alpine
uses: docker/build-push-action@v5
Expand All @@ -252,7 +252,7 @@ jobs:
- name: Get docker tag for Ubuntu image
id: ubuntu
run: |
echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.7/Dockerfile.focal)"
echo "IMAGE_TAG=$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.7/Dockerfile.focal)" >> $GITHUB_OUTPUT
- name: Build CKAN 2.7 ubuntu
uses: docker/build-push-action@v5
Expand Down Expand Up @@ -288,7 +288,7 @@ jobs:
password: ${{ secrets.CR_PAT }}

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache-datapusher
key: ${{ runner.os }}-buildx-datapusher-${{ github.sha }}
Expand All @@ -298,7 +298,7 @@ jobs:
- name: Get docker tag for datapusher image
id: datapusher
run: |
echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/datapusher/Dockerfile)"
echo "IMAGE_TAG=$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/datapusher/Dockerfile)" >> $GITHUB_OUTPUT
- name: Build and push CKAN datapusher
uses: docker/build-push-action@v5
Expand Down Expand Up @@ -334,7 +334,7 @@ jobs:
password: ${{ secrets.CR_PAT }}

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache-psql-init
key: ${{ runner.os }}-buildx-psql-init-${{ github.sha }}
Expand All @@ -344,7 +344,7 @@ jobs:
- name: Get docker tag for psql-init image
id: psql-init
run: |
echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/psql-init/Dockerfile)"
echo "IMAGE_TAG=$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/psql-init/Dockerfile)" >> $GITHUB_OUTPUT
- name: Build and push psql-init
uses: docker/build-push-action@v5
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pr_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
/tmp/.buildx-cache-alpine-2-10
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
/tmp/.buildx-cache-alpine-2-9
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
/tmp/.buildx-cache-alpine-2-8
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
/tmp/.buildx-cache-alpine-2-7
Expand Down Expand Up @@ -212,7 +212,7 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache-datapusher
key: ${{ runner.os }}-buildx-datapusher-${{ github.sha }}
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache-psql-init
key: ${{ runner.os }}-buildx-psql-init-${{ github.sha }}
Expand Down

0 comments on commit b3fec78

Please sign in to comment.