Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
AaronDewes authored Jul 16, 2023
1 parent dbaf6c8 commit 29b5500
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 11 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/dashboard-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,27 @@ jobs:
- name: Set env variables
run: |
echo "BRANCH=$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//-/g')" >> $GITHUB_ENV
REPO_OWNER="${{ github.repository_owner }}""
echo "REPO_OWNER=${REPO_OWNER,,}" >> $GITHUB_ENV
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
id: qemu

- name: Setup Docker buildx action
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
id: buildx

- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
Expand All @@ -47,5 +50,5 @@ jobs:
--platform linux/amd64,linux/arm64 \
--cache-from "type=local,src=/tmp/.buildx-cache" \
--cache-to "type=local,dest=/tmp/.buildx-cache" \
--tag ghcr.io/${{ github.repository_owner }}/dashboard:$BRANCH \
--tag ghcr.io/$REPO_OWNER/dashboard:$BRANCH \
--output "type=registry" ./packages/dashboard/
15 changes: 9 additions & 6 deletions .github/workflows/manager-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,27 @@ jobs:
- name: Set env variables
run: |
echo "BRANCH=$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//-/g')" >> $GITHUB_ENV
REPO_OWNER="${{ github.repository_owner }}""
echo "REPO_OWNER=${REPO_OWNER,,}" >> $GITHUB_ENV
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
id: qemu

- name: Setup Docker buildx action
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
id: buildx

- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
Expand All @@ -47,5 +50,5 @@ jobs:
--platform linux/amd64,linux/arm64 \
--cache-from "type=local,src=/tmp/.buildx-cache" \
--cache-to "type=local,dest=/tmp/.buildx-cache" \
--tag ghcr.io/${{ github.repository_owner }}/manager:$BRANCH \
--output "type=registry" ./packages/dashboard/
--tag ghcr.io/$REPO_OWNER/manager:$BRANCH \
--output "type=registry" ./packages/manager/

0 comments on commit 29b5500

Please sign in to comment.