diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2019-11-24 13:31:20 -0800 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2019-11-28 11:12:59 -0800 |
commit | 311eb9a2e3e4959eb53a2a7bcebd46aaa03e8829 (patch) | |
tree | ed3ee5f839ce12b447c6d3ae238ece8e1ab6559e /.github | |
parent | 6612297022d63c38f674cfe5378a9db250b8ef6f (diff) | |
download | subsurface-311eb9a2e3e4959eb53a2a7bcebd46aaa03e8829.tar.gz |
GitHub Actions: split the container build action into two
And remove the Windows/MXE one that doesn't work because of the 6h time limit.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/android-dockerimage.yml | 30 | ||||
-rw-r--r-- | .github/workflows/dockerimages.yml | 72 | ||||
-rw-r--r-- | .github/workflows/linux-dockerimage.yml | 29 |
3 files changed, 59 insertions, 72 deletions
diff --git a/.github/workflows/android-dockerimage.yml b/.github/workflows/android-dockerimage.yml new file mode 100644 index 000000000..c5cdf5154 --- /dev/null +++ b/.github/workflows/android-dockerimage.yml @@ -0,0 +1,30 @@ +name: Docker Image CI + +on: + push: + paths: + - scripts/docker/android-build-container/Dockerfile + +jobs: + android-build-container: + runs-on: ubuntu-latest + env: + VERSION: 5.13.01 + + 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: Build the Docker image + run: docker build ./scripts/docker/android-build-container/ --tag docker.pkg.github.com/${GITHUB_REPOSITORY,,}/android-build-container:${VERSION} + + - name: Push the Docker image + run: | + docker login docker.pkg.github.com -u ${GITHUB_REPOSITORY/\/*/} -p ${{ secrets.GITHUB_TOKEN }} + docker push docker.pkg.github.com/${GITHUB_REPOSITORY,,}/android-build-container:${VERSION} diff --git a/.github/workflows/dockerimages.yml b/.github/workflows/dockerimages.yml deleted file mode 100644 index 10eebd0ef..000000000 --- a/.github/workflows/dockerimages.yml +++ /dev/null @@ -1,72 +0,0 @@ -name: Docker Image CI - -on: - push: - branches: - - master - paths: - - scripts/docker/android-build-container/Dockerfile - - scripts/docker/mxe-build-container/Dockerfile - - scripts/docker/trusty-qt512/Dockerfile - - -jobs: - android-build-container: - runs-on: ubuntu-latest - env: - VERSION: 5.13.01 - - 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: Build the Docker image - run: docker build ./scripts/docker/android-build-container/ --tag docker.pkg.github.com/${GITHUB_REPOSITORY,,}/android-build-container:${VERSION} - - - name: Push the Docker image - run: | - docker login docker.pkg.github.com -u ${GITHUB_REPOSITORY/\/*/} -p ${{ secrets.GITHUB_TOKEN }} - docker push docker.pkg.github.com/${GITHUB_REPOSITORY,,}/android-build-container:${VERSION} - - mxe-build-container: - runs-on: ubuntu-latest - timeout-minutes: 720 - env: - VERSION: 0.9 - - steps: - - uses: actions/checkout@v1 - - name: Build the Docker image - run: docker build ./scripts/docker/mxe-build-container/ --tag docker.pkg.github.com/${GITHUB_REPOSITORY,,}/mxe-build-container:${VERSION} - - - name: Push the Docker image - run: | - docker login docker.pkg.github.com -u ${GITHUB_REPOSITORY/\/*/} -p ${{ secrets.GITHUB_TOKEN }} - docker push docker.pkg.github.com/${GITHUB_REPOSITORY,,}/mxe-build-container:${VERSION} - - trusty-qt512: - runs-on: ubuntu-latest - env: - VERSION: 0.7 - - steps: - - uses: actions/checkout@v1 - - - name: Get our pre-reqs - run: | - cd scripts/docker/trusty-qt512 - bash getpackages.sh - - - name: Build the Docker image - run: docker build ./scripts/docker/trusty-qt512/ --tag docker.pkg.github.com/${GITHUB_REPOSITORY,,}/trusty-qt512:${VERSION} - - - name: Push the Docker image - run: | - docker login docker.pkg.github.com -u ${GITHUB_REPOSITORY/\/*/} -p ${{ secrets.GITHUB_TOKEN }} - docker push docker.pkg.github.com/${GITHUB_REPOSITORY,,}/trusty-qt512:${VERSION} diff --git a/.github/workflows/linux-dockerimage.yml b/.github/workflows/linux-dockerimage.yml new file mode 100644 index 000000000..857ed5f5a --- /dev/null +++ b/.github/workflows/linux-dockerimage.yml @@ -0,0 +1,29 @@ +name: Docker Image CI + +on: + push: + paths: + - scripts/docker/trusty-qt512/Dockerfile + + +jobs: + trusty-qt512: + runs-on: ubuntu-latest + env: + VERSION: 0.7 + + steps: + - uses: actions/checkout@v1 + + - name: Get our pre-reqs + run: | + cd scripts/docker/trusty-qt512 + bash getpackages.sh + + - name: Build the Docker image + run: docker build ./scripts/docker/trusty-qt512/ --tag docker.pkg.github.com/${GITHUB_REPOSITORY,,}/trusty-qt512:${VERSION} + + - name: Push the Docker image + run: | + docker login docker.pkg.github.com -u ${GITHUB_REPOSITORY/\/*/} -p ${{ secrets.GITHUB_TOKEN }} + docker push docker.pkg.github.com/${GITHUB_REPOSITORY,,}/trusty-qt512:${VERSION} |