From 0c6f86f12db41ff19e8a3b34a2b018a8ab7bca84 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 24 Nov 2019 14:20:19 -0800 Subject: GitHub Action: use the containers we create with GitHub Actions This closes the loop. Signed-off-by: Dirk Hohndel --- .github/workflows/android.yml | 5 +---- .github/workflows/linux-trusty-5.12.yml | 5 +---- .github/workflows/windows.yml | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index db8c17ed5..7a1ea65b1 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -11,10 +11,7 @@ jobs: buildInContainer: runs-on: ubuntu-latest container: - # FIXME: Use templating once we can mangle org/repo name into something that docker accepts. - # and anonymus / actions access to github packages works. - #image: docker://docker.pkg.github.com/${{ github.repository }}/android-builder:5.13.01 - image: docker://dirkhh/android-builder:5.13.01 + image: docker://subsurface/android-build-container:5.13.10 steps: - name: checkout sources diff --git a/.github/workflows/linux-trusty-5.12.yml b/.github/workflows/linux-trusty-5.12.yml index e9c23afc7..c4ae4195d 100644 --- a/.github/workflows/linux-trusty-5.12.yml +++ b/.github/workflows/linux-trusty-5.12.yml @@ -11,10 +11,7 @@ jobs: buildInContainer: runs-on: ubuntu-latest container: - # FIXME: Use templating once we can mangle org/repo name into something that docker accepts. - # and anonymus / actions access to github packages works. - #image: docker://docker.pkg.github.com/${{ github.repository }}/trusty-qt512:0.7 - image: docker://dirkhh/trusty-qt512:0.7 + image: docker://subsurface/trusty-qt512:1.0 steps: - name: checkout sources diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2710cfa37..bf0a27dd2 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -11,10 +11,7 @@ jobs: buildInContainer: runs-on: ubuntu-latest container: - # FIXME: Use templating once we can mangle org/repo name into something that docker accepts. - # and anonymus / actions access to github packages works. - #image: docker://docker.pkg.github.com/${{ github.repository }}/mxe-build-container:0.9 - image: docker://dirkhh/mxe-build-container:0.9 + image: docker://subsurface/mxe-build-container:1.0 steps: - name: checkout sources -- cgit v1.2.3-70-g09d2