From 8cbde0829d209fa2f27d07e0ad875fd938b8e1f3 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 29 Dec 2020 12:41:28 -0800 Subject: GitHub Actions: clearly disable the docker build tasks These haven't been used for a while and still create strange errors. Signed-off-by: Dirk Hohndel --- .github/workflows/android-dockerimage.disabled | 49 ++++++++++++++++++++++++++ .github/workflows/android-dockerimage.yml | 49 -------------------------- .github/workflows/linux-dockerimage.disabled | 39 ++++++++++++++++++++ .github/workflows/linux-dockerimage.yml | 39 -------------------- 4 files changed, 88 insertions(+), 88 deletions(-) create mode 100644 .github/workflows/android-dockerimage.disabled delete mode 100644 .github/workflows/android-dockerimage.yml create mode 100644 .github/workflows/linux-dockerimage.disabled delete mode 100644 .github/workflows/linux-dockerimage.yml (limited to '.github') diff --git a/.github/workflows/android-dockerimage.disabled b/.github/workflows/android-dockerimage.disabled new file mode 100644 index 000000000..e34a3a4b2 --- /dev/null +++ b/.github/workflows/android-dockerimage.disabled @@ -0,0 +1,49 @@ +name: Android Docker Image CI + +# -- disabled for now, as the resulting image is HUGE and causes our +# Android builds to fail +#on: +# push: +# paths: +# - scripts/docker/android-build-container/Dockerfile +# - .github/workflows/android-docker* + +# this is here to prevent errors about not having an on: clause +on: + repository_dispatch: + types: + - unused + +jobs: + android-build-container: + runs-on: ubuntu-latest + env: + VERSION: ${{ '5.13.10' }} # the version numbers here is based on the Qt version, the third digit is the rev of the docker image + + steps: + - uses: actions/checkout@v1 + + - name: Get our pre-reqs + run: | + cd scripts/docker/android-build-container + bash download.sh + sed -ie 's/^sudo/#sudo/' setup-docker.sh + bash setup-docker.sh + + - name: set env + run: | + v=${{ env.VERSION }} + b=${{ github.ref }} # -BRANCH suffix, unless the branch is master + b=${b/refs\/heads\//} + b=${b,,} # the name needs to be all lower case + if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi + echo "::set-env name=NAME::subsurface/android-build-container${b}:${v}" + + - name: Build and Publish Linux Docker image to Dockerhub + uses: elgohr/Publish-Docker-Github-Action@master + with: + name: ${{ env.NAME }} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + dockerfile: 'Dockerfile' + workdir: './scripts/docker/android-build-container/' diff --git a/.github/workflows/android-dockerimage.yml b/.github/workflows/android-dockerimage.yml deleted file mode 100644 index e34a3a4b2..000000000 --- a/.github/workflows/android-dockerimage.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: Android Docker Image CI - -# -- disabled for now, as the resulting image is HUGE and causes our -# Android builds to fail -#on: -# push: -# paths: -# - scripts/docker/android-build-container/Dockerfile -# - .github/workflows/android-docker* - -# this is here to prevent errors about not having an on: clause -on: - repository_dispatch: - types: - - unused - -jobs: - android-build-container: - runs-on: ubuntu-latest - env: - VERSION: ${{ '5.13.10' }} # the version numbers here is based on the Qt version, the third digit is the rev of the docker image - - steps: - - uses: actions/checkout@v1 - - - name: Get our pre-reqs - run: | - cd scripts/docker/android-build-container - bash download.sh - sed -ie 's/^sudo/#sudo/' setup-docker.sh - bash setup-docker.sh - - - name: set env - run: | - v=${{ env.VERSION }} - b=${{ github.ref }} # -BRANCH suffix, unless the branch is master - b=${b/refs\/heads\//} - b=${b,,} # the name needs to be all lower case - if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi - echo "::set-env name=NAME::subsurface/android-build-container${b}:${v}" - - - name: Build and Publish Linux Docker image to Dockerhub - uses: elgohr/Publish-Docker-Github-Action@master - with: - name: ${{ env.NAME }} - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - dockerfile: 'Dockerfile' - workdir: './scripts/docker/android-build-container/' diff --git a/.github/workflows/linux-dockerimage.disabled b/.github/workflows/linux-dockerimage.disabled new file mode 100644 index 000000000..249a4baf1 --- /dev/null +++ b/.github/workflows/linux-dockerimage.disabled @@ -0,0 +1,39 @@ +name: Linux Qt 5.12 Docker Image CI + +#on: +# push: +# paths: +# - scripts/docker/trusty-qt512/Dockerfile +# - .github/workflows/linux-docker* + +jobs: + trusty-qt512: + runs-on: ubuntu-latest + env: + VERSION: ${{ '1.0' }} # 'official' images should have a dot-zero version + + steps: + - uses: actions/checkout@v1 + + - name: Get our pre-reqs + run: | + cd scripts/docker/trusty-qt512 + bash getpackages.sh + + - name: set env + run: | + v=${{ env.VERSION }} + b=${{ github.ref }} # -BRANCH suffix, unless the branch is master + b=${b/refs\/heads\//} + b=${b,,} # the name needs to be all lower case + if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi + echo "::set-env name=NAME::subsurface/trusty-qt512${b}:${v}" + + - name: Build and Publish Linux Docker image to Dockerhub + uses: elgohr/Publish-Docker-Github-Action@master + with: + name: ${{ env.NAME }} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + dockerfile: 'Dockerfile' + workdir: './scripts/docker/trusty-qt512/' diff --git a/.github/workflows/linux-dockerimage.yml b/.github/workflows/linux-dockerimage.yml deleted file mode 100644 index 249a4baf1..000000000 --- a/.github/workflows/linux-dockerimage.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Linux Qt 5.12 Docker Image CI - -#on: -# push: -# paths: -# - scripts/docker/trusty-qt512/Dockerfile -# - .github/workflows/linux-docker* - -jobs: - trusty-qt512: - runs-on: ubuntu-latest - env: - VERSION: ${{ '1.0' }} # 'official' images should have a dot-zero version - - steps: - - uses: actions/checkout@v1 - - - name: Get our pre-reqs - run: | - cd scripts/docker/trusty-qt512 - bash getpackages.sh - - - name: set env - run: | - v=${{ env.VERSION }} - b=${{ github.ref }} # -BRANCH suffix, unless the branch is master - b=${b/refs\/heads\//} - b=${b,,} # the name needs to be all lower case - if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi - echo "::set-env name=NAME::subsurface/trusty-qt512${b}:${v}" - - - name: Build and Publish Linux Docker image to Dockerhub - uses: elgohr/Publish-Docker-Github-Action@master - with: - name: ${{ env.NAME }} - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - dockerfile: 'Dockerfile' - workdir: './scripts/docker/trusty-qt512/' -- cgit v1.2.3-70-g09d2