Skip to content

Commit

Permalink
fix: cache needs to be version 2
Browse files Browse the repository at this point in the history
  • Loading branch information
Filipe Forattini committed Jun 7, 2022
1 parent 53905a8 commit 6baccc6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,21 +201,21 @@ jobs:
# load caches
- name: Load cache from yarn.lock
uses: actions/cache@v2
uses: actions/cache@v3
if: steps.node_setup.outputs.cache_key == 'yarn.lock'
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}

- name: Load cache from package-lock.json
uses: actions/cache@v2
uses: actions/cache@v3
if: steps.node_setup.outputs.cache_key == 'package-lock.json'
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}

- name: Load cache from package.json
uses: actions/cache@v2
uses: actions/cache@v3
if: steps.node_setup.outputs.cache_key == 'package-lock.json'
with:
path: '**/node_modules'
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/service-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ jobs:
repository: filipeforattini/ff-iac-github-actions

- name: Install | QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v1

- name: Install | Docker Buildx
id: buildx
Expand Down Expand Up @@ -599,11 +599,11 @@ jobs:
- name: Docs | Lint result
run: |
echo "Hadolint: \`${{ steps.hadolint.outcome }}\`" >> $GITHUB_STEP_SUMMARY
echo "\`\`\`\n $HADOLINT_RESULTS \n \`\`\`" >> $GITHUB_STEP_SUMMARY
echo "\`\`\`txt \n $HADOLINT_RESULTS \n \`\`\`" >> $GITHUB_STEP_SUMMARY
- name: Build image test
if: inputs.staticAnalysis == true
uses: docker/build-push-action@v3
uses: docker/build-push-action@v2
with:
context: .
cache-from: type=gha
Expand Down Expand Up @@ -635,7 +635,7 @@ jobs:
${{ runner.os }}-multi-buildx
- name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v2
with:
context: .
push: true
Expand Down Expand Up @@ -679,7 +679,7 @@ jobs:
repository: filipeforattini/ff-iac-github-actions

- name: Install | QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v1

- name: Install | Docker Buildx
id: buildx
Expand Down Expand Up @@ -761,11 +761,11 @@ jobs:
- name: Docs | Lint result
run: |
echo "Hadolint: \`${{ steps.hadolint.outcome }}\`" >> $GITHUB_STEP_SUMMARY
echo "\`\`\`\n $HADOLINT_RESULTS \n \`\`\`" >> $GITHUB_STEP_SUMMARY
echo "\`\`\`txt \n $HADOLINT_RESULTS \n \`\`\`" >> $GITHUB_STEP_SUMMARY
- name: Build image test
if: inputs.staticAnalysis == true
uses: docker/build-push-action@v3
uses: docker/build-push-action@v2
with:
context: .
cache-from: type=gha
Expand Down Expand Up @@ -797,13 +797,13 @@ jobs:
${{ runner.os }}-multi-buildx
- name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v2
with:
context: .
push: true
platforms: ${{ inputs.platforms }}
builder: ${{ steps.buildx.outputs.name }}
tags: ${{steps.node_setup.outputs.docker_image_tags}}, ${{steps.node_setup.outputs.docker_image_fullname}}:${{needs.Release-Python.outputs.Version}}
tags: ${{steps.node_setup.outputs.docker_image_tags}}, ${{steps.node_setup.outputs.docker_image_fullname}}:${{needs.Release-Node.outputs.Version}}
labels: "organization: ${{github.repository_owner}}, repository: ${{github.repository}}, branch: ${{needs.Setup.outputs.Branch}}, commit: ${{needs.Setup.outputs.ShaHash}}, date: ${{needs.Setup.outputs.Date}}, timestamp: ${{needs.Setup.outputs.Timestamp}}"
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new
Expand Down

0 comments on commit 6baccc6

Please sign in to comment.