Compare commits

...

4 Commits
ci ... master

Author SHA1 Message Date
liushuyu
26984273ef
CI: fix digest naming 2024-02-26 22:26:36 -07:00
liushuyu
a30626957b
CI: merge digest caches 2024-02-26 21:49:55 -07:00
liushuyu
b9b1603ba1
CI: upgrade GitHub Actions 2024-02-11 23:12:18 -07:00
liushuyu
80cf68a791
dockerfile: upgrade base image to 23.10 2024-02-11 21:45:21 -07:00
2 changed files with 18 additions and 15 deletions

View File

@ -24,26 +24,26 @@ jobs:
- linux/amd64
- linux/arm64
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Create Docker Image Label
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY_IMAGE }}
tags: type=raw,value=latest,enable={{is_default_branch}}
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker BuildX
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
if: (github.ref == 'refs/heads/master') && (github.repository == 'citra-emu/citra-multiplayer-dedicated')
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build Image
id: build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
platforms: ${{ matrix.platform }}
push: ${{ (github.ref == 'refs/heads/master') && (github.repository == 'citra-emu/citra-multiplayer-dedicated') }}
@ -52,11 +52,13 @@ jobs:
run: |
mkdir -p /tmp/digests
digest="${{ steps.build.outputs.digest }}"
cache_name="digests-${{ matrix.platform }}"
echo "CACHE_NAME=${cache_name/\//-}" >> $GITHUB_ENV
touch "/tmp/digests/${digest#sha256:}"
- name: Upload digest
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: digests
name: ${{ env.CACHE_NAME }}
path: /tmp/digests/*
if-no-files-found: error
retention-days: 1
@ -67,20 +69,21 @@ jobs:
- build
steps:
- name: Download digests
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: digests
pattern: digests-*
path: /tmp/digests
merge-multiple: true
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Create Docker Image Label
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY_IMAGE }}
tags: type=raw,value=latest,enable={{is_default_branch}}
- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

View File

@ -1,10 +1,10 @@
# syntax=docker/dockerfile:1.3
ARG UBUNTU_RELEASE=23.04
ARG UBUNTU_RELEASE=23.10
ARG USER=ubuntu UID=101 GROUP=ubuntu GID=101
### BOILERPLATE BEGIN ###
FROM golang:1.20 AS chisel
FROM golang:1.22 AS chisel
ARG UBUNTU_RELEASE
RUN git clone -b ubuntu-${UBUNTU_RELEASE} https://github.com/canonical/chisel-releases /opt/chisel-releases \
&& git clone --depth 1 -b main https://github.com/canonical/chisel /opt/chisel