Skip to content

Commit

Permalink
Update GitHub actions cache version and remove redundant bazel step i…
Browse files Browse the repository at this point in the history
…n sylius-php workflow
  • Loading branch information
piotrkardasz committed Feb 1, 2024
1 parent 468f2dc commit c1e8f43
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 13 deletions.
1 change: 1 addition & 0 deletions .bazelversion
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5.0.0
2 changes: 1 addition & 1 deletion .github/workflows/sylius-nginx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
uses: docker/[email protected]

- name: Cache Docker layers
uses: actions/cache@v3.3.2
uses: actions/cache@v4.0.0
with:
path: /tmp/.buildx-cache
key: "${{ runner.os }}-nginx-alpine-buildx-cache-${{ vars.CACHE_VERSION }}-${{ steps.generate-uuid.outputs.uuid }}"
Expand Down
13 changes: 4 additions & 9 deletions .github/workflows/sylius-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
uses: docker/[email protected]

- name: Cache Docker layers
uses: actions/cache@v3.3.2
uses: actions/cache@v4.0.0
with:
path: /tmp/.buildx-cache
key: "${{ runner.os }}-php-${{ matrix.php }}-${{ matrix.distro }}-buildx-cache-${{ vars.CACHE_VERSION }}-${{ steps.generate-uuid.outputs.uuid }}"
Expand Down Expand Up @@ -114,13 +114,8 @@ jobs:
cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new-arm64
outputs: type=docker,dest=./external/image-arm64.tar

- name: Setup Bazel
uses: abhinavsingh/setup-bazel@v3
with:
version: 5.0.0

- name: Mount Bazel cache
uses: actions/cache@v3.3.2
uses: actions/cache@v4.0.0
with:
path: "~/.cache/bazel"
key: "${{ runner.os }}-php-${{ matrix.php }}-${{ matrix.distro }}-bazel-cache-${{ vars.CACHE_VERSION }}-${{ steps.generate-uuid.outputs.uuid }}"
Expand Down Expand Up @@ -201,7 +196,7 @@ jobs:
uses: docker/[email protected]

- name: Cache Docker layers
uses: actions/cache@v3.3.2
uses: actions/cache@v4.0.0
with:
path: /tmp/.buildx-cache
key: "${{ runner.os }}-php-xdebug-${{ matrix.php }}-${{ matrix.distro }}-buildx-cache-${{ vars.CACHE_VERSION }}-${{ steps.generate-uuid.outputs.uuid }}"
Expand Down Expand Up @@ -284,7 +279,7 @@ jobs:
uses: docker/[email protected]

- name: Cache Docker layers
uses: actions/cache@v3.3.2
uses: actions/cache@v4.0.0
with:
path: /tmp/.buildx-cache
key: "${{ runner.os }}-php-fixuid-${{ matrix.php }}-${{ matrix.version }}-buildx-cache-${{ vars.CACHE_VERSION }}-${{ steps.generate-uuid.outputs.uuid }}"
Expand Down
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
/bazel-*
# Ignore outputs generated during Bazel bootstrapping.
/output/
# Bazelisk version file
.bazelversion
# User-specific .bazelrc
user.bazelrc
/external/*
!external/.gitignore
!external/.gitignore

0 comments on commit c1e8f43

Please sign in to comment.