Skip to content

Commit 2e8cc08

Browse files
authored
Update main.yml
1 parent 7ebb420 commit 2e8cc08

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

.github/workflows/main.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
pull_request:
77
branches: [ master, maint/* ]
88

9+
env:
10+
foo: docker.pkg.github.com
11+
912
jobs:
1013
# Build the docker container images that we will use for our Linux builds. This will
1114
# identify the last commit to the repository that updated the docker images, and try
@@ -55,7 +58,7 @@ jobs:
5558
platform:
5659
-
5760
os: ubuntu-latest
58-
image: 'ubuntu:xenial'
61+
image: xenial
5962
cc: gcc
6063
cmake_generator: Ninja
6164
cmake_options: -DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
@@ -95,7 +98,12 @@ jobs:
9598
env
9699
- run: echo ${{ matrix.platform.os }} ${{matrix.platform.image}}
97100
- run: |
98-
mkdir build && cd build
99-
../azure-pipelines/build.sh
100-
../azure-pipelines/test.sh
101+
if [ -z "${{ matrix.platform.image }}" ]; then
102+
docker login https://${{ env.foo }} -u ${{ github.actor }} -p ${{ github.token }}
103+
docker run ${{ env.foo }}/${{ matrix.platform.image }}:latest echo hi
104+
else
105+
mkdir build && cd build
106+
../azure-pipelines/build.sh
107+
../azure-pipelines/test.sh
108+
fi
101109
shell: bash

0 commit comments

Comments
 (0)