Unverified Commit 2e8cc08e by Edward Thomson Committed by GitHub

Update main.yml

parent 7ebb420a
...@@ -6,6 +6,9 @@ on: ...@@ -6,6 +6,9 @@ on:
pull_request: pull_request:
branches: [ master, maint/* ] branches: [ master, maint/* ]
env:
foo: docker.pkg.github.com
jobs: jobs:
# Build the docker container images that we will use for our Linux builds. This will # Build the docker container images that we will use for our Linux builds. This will
# identify the last commit to the repository that updated the docker images, and try # identify the last commit to the repository that updated the docker images, and try
...@@ -55,7 +58,7 @@ jobs: ...@@ -55,7 +58,7 @@ jobs:
platform: platform:
- -
os: ubuntu-latest os: ubuntu-latest
image: 'ubuntu:xenial' image: xenial
cc: gcc cc: gcc
cmake_generator: Ninja cmake_generator: Ninja
cmake_options: -DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON cmake_options: -DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
...@@ -95,7 +98,12 @@ jobs: ...@@ -95,7 +98,12 @@ jobs:
env env
- run: echo ${{ matrix.platform.os }} ${{matrix.platform.image}} - run: echo ${{ matrix.platform.os }} ${{matrix.platform.image}}
- run: | - run: |
if [ -z "${{ matrix.platform.image }}" ]; then
docker login https://${{ env.foo }} -u ${{ github.actor }} -p ${{ github.token }}
docker run ${{ env.foo }}/${{ matrix.platform.image }}:latest echo hi
else
mkdir build && cd build mkdir build && cd build
../azure-pipelines/build.sh ../azure-pipelines/build.sh
../azure-pipelines/test.sh ../azure-pipelines/test.sh
fi
shell: bash shell: bash
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment