Merge pull request #5706 from libgit2/ethomson/ci

ci: more GitHub Actions

.github/workflows/coverity.yml

@@ -20,7 +20,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Download container
-      run: ci/getcontainer.sh ci/docker/xenial
+      run: ci/getcontainer.sh xenial
       env:
         DOCKER_REGISTRY: ${{ env.docker-registry }}
         GITHUB_TOKEN: ${{ secrets.github_token }}

.github/workflows/main.yml

@@ -26,10 +26,22 @@ jobs:
     strategy:
       matrix:
         container:
-        - xenial
-        - bionic
-        - focal
-        - docurium
+        - name: xenial
+        - name: bionic
+        - name: focal
+        - name: docurium
+        - name: bionic-x86
+          dockerfile: bionic
+          base: multiarch/ubuntu-core:x86-bionic
+          qemu: true
+        - name: bionic-arm32
+          dockerfile: bionic
+          base: multiarch/ubuntu-core:armhf-bionic
+          qemu: true
+        - name: bionic-arm64
+          dockerfile: bionic
+          base: multiarch/ubuntu-core:arm64-bionic
+          qemu: true
     runs-on: ubuntu-latest
     steps:
     - name: Check out repository
@@ -37,15 +49,23 @@ jobs:
       with:
         fetch-depth: 0
       if: github.event_name == 'push'
+    - name: Setup QEMU
+      run: docker run --rm --privileged multiarch/qemu-user-static:register --reset
+      if: matrix.container.qemu == true
     - name: Download existing container
-      run: ci/getcontainer.sh ${{ env.docker-config-path }}/${{ matrix.container }}
+      run: |
+        "${{ github.workspace }}/ci/getcontainer.sh" "${{ matrix.container.name }}" "${{ matrix.container.dockerfile }}"
       env:
         DOCKER_REGISTRY: ${{ env.docker-registry }}
         GITHUB_TOKEN: ${{ secrets.github_token }}
+      working-directory: ${{ env.docker-config-path }}
       if: github.event_name == 'push'
     - name: Build and publish image
       run: |
-        docker build -t ${{ env.docker-registry-container-sha }} --build-arg BASE=${{ matrix.container.base }} -f ${{ matrix.container }} .
+        if [ "${{ matrix.container.base }}" != "" ]; then
+          BASE_ARG="--build-arg BASE=${{ matrix.container.base }}"
+        fi
+        docker build -t ${{ env.docker-registry-container-sha }} ${BASE_ARG} -f ${{ env.dockerfile }} .
         docker push ${{ env.docker-registry-container-sha }}
       working-directory: ${{ env.docker-config-path }}
       if: github.event_name == 'push' && env.docker-container-exists != 'true'
@@ -55,40 +75,45 @@ jobs:
   # or on the actual hosts (macOS, Windows).
   build:
     name: Build
-    needs: [build_containers]
+    needs: [ build_containers ]
     strategy:
       matrix:
         platform:
         - # Xenial, GCC, OpenSSL
-          image: xenial
+          container:
+            name: xenial
           env:
             CC: gcc
             CMAKE_GENERATOR: Ninja
             CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
           os: ubuntu-latest
         - # Xenial, GCC, mbedTLS
-          image: xenial
+          container:
+            name: xenial
           env:
             CC: gcc
             CMAKE_GENERATOR: Ninja
             CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
           os: ubuntu-latest
         - # Xenial, Clang, OpenSSL
-          image: xenial
+          container:
+            name: xenial
           env:
             CC: clang
             CMAKE_GENERATOR: Ninja
             CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
           os: ubuntu-latest
         - # Xenial, Clang, mbedTLS
-          image: xenial
+          container:
+            name: xenial
           env:
             CC: clang
             CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
             CMAKE_GENERATOR: Ninja
           os: ubuntu-latest
         - # Focal, Clang 10, mbedTLS, MemorySanitizer
-          image: focal
+          container:
+            name: focal
           env:
             CC: clang-10
             CFLAGS: -fsanitize=memory -fsanitize-memory-track-origins=2 -fsanitize-blacklist=/home/libgit2/source/script/sanitizers.supp -fno-optimize-sibling-calls -fno-omit-frame-pointer
@@ -99,7 +124,8 @@ jobs:
             ASAN_SYMBOLIZER_PATH: /usr/bin/llvm-symbolizer-10
           os: ubuntu-latest
         - # Focal, Clang 10, OpenSSL, UndefinedBehaviorSanitizer
-          image: focal
+          container:
+            name: focal
           env:
             CC: clang-10
             CFLAGS: -fsanitize=undefined,nullability -fno-sanitize-recover=undefined,nullability -fsanitize-blacklist=/home/libgit2/source/script/sanitizers.supp -fno-optimize-sibling-calls -fno-omit-frame-pointer
@@ -110,7 +136,8 @@ jobs:
             ASAN_SYMBOLIZER_PATH: /usr/bin/llvm-symbolizer-10
           os: ubuntu-latest
         - # Focal, Clang 10, OpenSSL, ThreadSanitizer
-          image: focal
+          container:
+            name: focal
           env:
             CC: clang-10
             CFLAGS: -fsanitize=thread -fno-optimize-sibling-calls -fno-omit-frame-pointer
@@ -181,21 +208,26 @@ jobs:
       run: ci/setup-${{ matrix.platform.setup-script }}.sh
       shell: bash
       if: matrix.platform.setup-script != ''
+    - name: Setup QEMU
+      run: docker run --rm --privileged multiarch/qemu-user-static:register --reset
+      if: matrix.platform.container.qemu == true
     - name: Download container
-      run: ci/getcontainer.sh ${{ env.docker-config-path }}/${{ matrix.platform.image }}
+      run: |
+        "${{ github.workspace }}/ci/getcontainer.sh" "${{ matrix.platform.container.name }}" "${{ matrix.platform.container.dockerfile }}"
       env:
         DOCKER_REGISTRY: ${{ env.docker-registry }}
         GITHUB_TOKEN: ${{ secrets.github_token }}
-      if: matrix.platform.image != ''
+      working-directory: ${{ env.docker-config-path }}
+      if: matrix.platform.container.name != ''
     - name: Create container
-      run: docker build -t ${{ env.docker-registry-container-sha }} -f ${{ matrix.platform.image }} .
+      run: docker build -t ${{ env.docker-registry-container-sha }} -f ${{ env.dockerfile }} .
       working-directory: ${{ env.docker-config-path }}
-      if: matrix.platform.image != '' && env.docker-container-exists != 'true'
+      if: matrix.platform.container.name != '' && env.docker-container-exists != 'true'
     - name: Build and test
       run: |
         export GITTEST_NEGOTIATE_PASSWORD="${{ secrets.GITTEST_NEGOTIATE_PASSWORD }}"
 
-        if [ -n "${{ matrix.platform.image }}" ]; then
+        if [ -n "${{ matrix.platform.container.name }}" ]; then
           docker run \
               --rm \
               -v "$(pwd):/home/libgit2/source" \
@@ -229,6 +261,13 @@ jobs:
     needs: [build_containers]
     runs-on: ubuntu-latest
     steps:
+    - name: Setup defaults
+      run: |
+        if [ "${{ matrix.container.dockerfile }}" = "" ]; then
+          echo "dockerfile=${{ matrix.container.dockerfile }}" >> $GITHUB_ENV
+        else
+          echo "dockerfile=${{ matrix.container.dockerfile }}" >> $GITHUB_ENV
+        fi
     - name: Check out repository
       uses: actions/checkout@v2
       with:

.github/workflows/nightly.yml

@@ -11,41 +11,49 @@ env:
   docker-config-path: ci/docker
 
 jobs:
+  # Run our nightly builds.  We build a matrix with the various build
+  # targets and their details.  Then we build either in a docker container
+  # (Linux) or on the actual hosts (macOS, Windows).
   build:
     name: Build
     strategy:
       matrix:
         platform:
         - # Xenial, GCC, OpenSSL
-          image: xenial
+          container:
+            name: xenial
           env:
             CC: gcc
             CMAKE_GENERATOR: Ninja
             CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
           os: ubuntu-latest
         - # Xenial, GCC, mbedTLS
-          image: xenial
+          container:
+            name: xenial
           env:
             CC: gcc
             CMAKE_GENERATOR: Ninja
             CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
           os: ubuntu-latest
         - # Xenial, Clang, OpenSSL
-          image: xenial
+          container:
+            name: xenial
           env:
             CC: clang
             CMAKE_GENERATOR: Ninja
             CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
           os: ubuntu-latest
         - # Xenial, Clang, mbedTLS
-          image: xenial
+          container:
+            name: xenial
           env:
             CC: clang
             CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
             CMAKE_GENERATOR: Ninja
           os: ubuntu-latest
         - # Focal, Clang 10, mbedTLS, MemorySanitizer
-          image: focal
+          container:
+            name: focal
           env:
             CC: clang-10
             CFLAGS: -fsanitize=memory -fsanitize-memory-track-origins=2 -fsanitize-blacklist=/home/libgit2/source/script/sanitizers.supp -fno-optimize-sibling-calls -fno-omit-frame-pointer
@@ -56,7 +64,8 @@ jobs:
             ASAN_SYMBOLIZER_PATH: /usr/bin/llvm-symbolizer-10
           os: ubuntu-latest
         - # Focal, Clang 10, OpenSSL, UndefinedBehaviorSanitizer
-          image: focal
+          container:
+            name: focal
           env:
             CC: clang-10
             CFLAGS: -fsanitize=undefined,nullability -fno-sanitize-recover=undefined,nullability -fsanitize-blacklist=/home/libgit2/source/script/sanitizers.supp -fno-optimize-sibling-calls -fno-omit-frame-pointer
@@ -66,11 +75,19 @@ jobs:
             SKIP_NEGOTIATE_TESTS: true
             ASAN_SYMBOLIZER_PATH: /usr/bin/llvm-symbolizer-10
           os: ubuntu-latest
-        - # linux arm64
-          os: [ focal, arm64, self-hosted ]
+        - # Focal, Clang 10, OpenSSL, ThreadSanitizer
+          container:
+            name: focal
           env:
-            CC: gcc
-            CMAKE_OPTIONS: -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
+            CC: clang-10
+            CFLAGS: -fsanitize=thread -fno-optimize-sibling-calls -fno-omit-frame-pointer
+            CMAKE_OPTIONS: -DCMAKE_PREFIX_PATH=/usr/local -DUSE_HTTPS=OpenSSL -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_BUNDLED_ZLIB=ON
+            CMAKE_GENERATOR: Ninja
+            SKIP_SSH_TESTS: true
+            SKIP_NEGOTIATE_TESTS: true
+            ASAN_SYMBOLIZER_PATH: /usr/bin/llvm-symbolizer-10
+            TSAN_OPTIONS: suppressions=/home/libgit2/source/script/thread-sanitizer.supp second_deadlock_stack=1
+          os: ubuntu-latest
         - # macOS
           os: macos-10.15
           env:
@@ -86,7 +103,7 @@ jobs:
           env:
             ARCH: amd64
             CMAKE_GENERATOR: Visual Studio 16 2019
-            CMAKE_OPTIONS: -A x64 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON
+            CMAKE_OPTIONS: -A x64 -DWIN32_LEAKCHECK=ON -DDEPRECATE_HARD=ON
             SKIP_SSH_TESTS: true
             SKIP_NEGOTIATE_TESTS: true
         - # Windows x86 Visual Studio
@@ -94,7 +111,7 @@ jobs:
           env:
             ARCH: x86
             CMAKE_GENERATOR: Visual Studio 16 2019
-            CMAKE_OPTIONS: -A Win32 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS -DUSE_BUNDLED_ZLIB=ON
+            CMAKE_OPTIONS: -A Win32 -DWIN32_LEAKCHECK=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS -DUSE_BUNDLED_ZLIB=ON
             SKIP_SSH_TESTS: true
             SKIP_NEGOTIATE_TESTS: true
         - # Windows amd64 mingw
@@ -119,9 +136,53 @@ jobs:
             BUILD_PATH: D:\Temp\mingw32\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin
             SKIP_SSH_TESTS: true
             SKIP_NEGOTIATE_TESTS: true
-      fail-fast: false
+        - # Bionic, x86, Clang, OpenSSL
+          container:
+            name: bionic-x86
+            dockerfile: bionic
+            qemu: true
+          env:
+            CC: clang
+            CMAKE_GENERATOR: Ninja
+            CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
+            RUN_INVASIVE_TESTS: true
+          os: ubuntu-latest
+        - # Bionic, x86, GCC, OpenSSL
+          container:
+            name: bionic-x86
+            dockerfile: bionic
+          env:
+            CC: gcc
+            CMAKE_GENERATOR: Ninja
+            CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
+            RUN_INVASIVE_TESTS: true
+          os: ubuntu-latest
+        - # Bionic, arm32, GCC, OpenSSL
+          container:
+            name: bionic-arm32
+            dockerfile: bionic
+            qemu: true
+          env:
+            CC: gcc
+            CMAKE_GENERATOR: Ninja
+            CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_GSSAPI=ON
+            RUN_INVASIVE_TESTS: true
+            SKIP_PROXY_TESTS: true
+          os: ubuntu-latest
+        - # Bionic, arm64, GCC, OpenSSL
+          container:
+            name: bionic-arm64
+            dockerfile: bionic
+            qemu: true
           env:
-      ACTIONS_RUNNER_TOKEN: ${{ secrets.ACTIONS_RUNNER_TOKEN }}
+            CC: gcc
+            CMAKE_GENERATOR: Ninja
+            CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_GSSAPI=ON
+            RUN_INVASIVE_TESTS: true
+            SKIP_PROXY_TESTS: true
+          os: ubuntu-latest
+      fail-fast: false
+    env: ${{ matrix.platform.env }}
     runs-on: ${{ matrix.platform.os }}
     steps:
     - name: Check out repository
@@ -131,23 +192,27 @@ jobs:
     - name: Set up build environment
       run: ci/setup-${{ matrix.platform.setup-script }}.sh
       shell: bash
-      env: ${{ matrix.platform.env }}
       if: matrix.platform.setup-script != ''
+    - name: Setup QEMU
+      run: docker run --rm --privileged multiarch/qemu-user-static:register --reset
+      if: matrix.platform.container.qemu == true
     - name: Download container
-      run: ci/getcontainer.sh ${{ env.docker-config-path }}/${{ matrix.platform.image }}
+      run: |
+        "${{ github.workspace }}/ci/getcontainer.sh" "${{ matrix.platform.container.name }}" "${{ matrix.platform.container.dockerfile }}"
       env:
         DOCKER_REGISTRY: ${{ env.docker-registry }}
         GITHUB_TOKEN: ${{ secrets.github_token }}
-      if: matrix.platform.image != ''
+      working-directory: ${{ env.docker-config-path }}
+      if: matrix.platform.container.name != ''
     - name: Create container
-      run: docker build -t ${{ env.docker-registry-container-sha }} -f ${{ matrix.platform.image }} .
+      run: docker build -t ${{ env.docker-registry-container-sha }} -f ${{ env.dockerfile }} .
       working-directory: ${{ env.docker-config-path }}
-      if: matrix.platform.image != '' && env.docker-container-exists != 'true'
+      if: matrix.platform.container.name != '' && env.docker-container-exists != 'true'
     - name: Build and test
       run: |
         export GITTEST_NEGOTIATE_PASSWORD="${{ secrets.GITTEST_NEGOTIATE_PASSWORD }}"
 
-        if [ -n "${{ matrix.platform.image }}" ]; then
+        if [ -n "${{ matrix.platform.container.name }}" ]; then
           docker run \
               --rm \
               -v "$(pwd):/home/libgit2/source" \
@@ -161,6 +226,7 @@ jobs:
               -e PKG_CONFIG_PATH \
               -e SKIP_NEGOTIATE_TESTS \
               -e SKIP_SSH_TESTS \
+              -e TSAN_OPTIONS \
               ${{ env.docker-registry-container-sha }} \
               /bin/bash -c "mkdir build && cd build && ../ci/build.sh && ../ci/test.sh"
         else
@@ -168,5 +234,4 @@ jobs:
           ../ci/build.sh
           ../ci/test.sh
         fi
-      env: ${{ matrix.platform.env }}
       shell: bash

azure-pipelines.yml

-resources:
-- repo: self
-
-trigger:
-- master
-- maint/*
-
-jobs:
-- job: linux_amd64_xenial_gcc_openssl
-  displayName: 'Linux (amd64; Xenial; GCC; OpenSSL)'
-  pool:
-    vmImage: 'ubuntu-18.04'
-  steps:
-  - template: azure-pipelines/docker.yml
-    parameters:
-      docker:
-        image: xenial
-        base: ubuntu:xenial
-      environmentVariables: |
-       CC=gcc
-       CMAKE_GENERATOR=Ninja
-       CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
-       GITTEST_NEGOTIATE_PASSWORD=${{ variables.GITTEST_NEGOTIATE_PASSWORD }}
-
-- job: linux_amd64_xenial_gcc_mbedtls
-  displayName: 'Linux (amd64; Xenial; GCC; mbedTLS)'
-  pool:
-    vmImage: 'ubuntu-18.04'
-  steps:
-  - template: azure-pipelines/docker.yml
-    parameters:
-      docker:
-        image: xenial
-        base: ubuntu:xenial
-      environmentVariables: |
-       CC=gcc
-       CMAKE_GENERATOR=Ninja
-       CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
-       GITTEST_NEGOTIATE_PASSWORD=${{ variables.GITTEST_NEGOTIATE_PASSWORD }}
-
-- job: linux_amd64_xenial_clang_openssl
-  displayName: 'Linux (amd64; Xenial; Clang; OpenSSL)'
-  pool:
-    vmImage: 'ubuntu-18.04'
-  steps:
-  - template: azure-pipelines/docker.yml
-    parameters:
-      docker:
-        image: xenial
-        base: ubuntu:xenial
-      environmentVariables: |
-       CC=clang
-       CMAKE_GENERATOR=Ninja
-       CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
-       GITTEST_NEGOTIATE_PASSWORD=${{ variables.GITTEST_NEGOTIATE_PASSWORD }}
-
-- job: linux_amd64_xenial_clang_mbedtls
-  displayName: 'Linux (amd64; Xenial; Clang; mbedTLS)'
-  pool:
-    vmImage: 'ubuntu-18.04'
-  steps:
-  - template: azure-pipelines/docker.yml
-    parameters:
-      docker:
-        image: xenial
-        base: ubuntu:xenial
-      environmentVariables: |
-       CC=clang
-       CMAKE_GENERATOR=Ninja
-       CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
-       GITTEST_NEGOTIATE_PASSWORD=${{ variables.GITTEST_NEGOTIATE_PASSWORD }}
-
-- job: macos
-  displayName: 'macOS (amd64; 10.15)'
-  pool:
-    vmImage: 'macOS-10.15'
-  steps:
-  - bash: . '$(Build.SourcesDirectory)/azure-pipelines/setup-osx.sh'
-    displayName: Setup
-  - template: azure-pipelines/bash.yml
-    parameters:
-      environmentVariables:
-        TMPDIR: $(Agent.TempDirectory)
-        PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig
-        CMAKE_GENERATOR: Ninja
-        CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks -DUSE_GSSAPI=ON
-        SKIP_SSH_TESTS: true
-        GITTEST_NEGOTIATE_PASSWORD: ${{ variables.GITTEST_NEGOTIATE_PASSWORD }}
-
-- job: windows_vs_amd64
-  displayName: 'Windows (amd64; Visual Studio)'
-  pool:
-    vmImage: 'vs2017-win2016'
-  steps:
-  - template: azure-pipelines/bash.yml
-    parameters:
-      environmentVariables:
-        CMAKE_GENERATOR: Visual Studio 15 2017
-        CMAKE_OPTIONS: -A x64 -DWIN32_LEAKCHECK=ON -DDEPRECATE_HARD=ON -DUSE_BUNDLED_ZLIB=ON
-        SKIP_SSH_TESTS: true
-        SKIP_NEGOTIATE_TESTS: true
-
-- job: windows_vs_x86
-  displayName: 'Windows (x86; Visual Studio)'
-  pool:
-    vmImage: 'vs2017-win2016'
-  steps:
-  - template: azure-pipelines/bash.yml
-    parameters:
-      environmentVariables:
-        CMAKE_GENERATOR: Visual Studio 15 2017
-        CMAKE_OPTIONS: -A Win32 -DWIN32_LEAKCHECK=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS -DUSE_BUNDLED_ZLIB=ON
-        SKIP_SSH_TESTS: true
-        SKIP_NEGOTIATE_TESTS: true
-
-- job: windows_mingw_amd64
-  displayName: 'Windows (amd64; MinGW)'
-  pool:
-    vmImage: 'vs2017-win2016'
-  steps:
-  - bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh'
-    displayName: Setup
-    env:
-      TEMP: $(Agent.TempDirectory)
-      ARCH: amd64
-  - template: azure-pipelines/bash.yml
-    parameters:
-      environmentVariables:
-        BUILD_PATH: $(Agent.TempDirectory)\mingw64\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin
-        CMAKE_GENERATOR: MinGW Makefiles
-        CMAKE_OPTIONS: -DDEPRECATE_HARD=ON
-        SKIP_SSH_TESTS: true
-        SKIP_NEGOTIATE_TESTS: true
-
-- job: windows_mingw_x86
-  displayName: 'Windows (x86; MinGW)'
-  pool:
-    vmImage: 'vs2017-win2016'
-  steps:
-  - bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh'
-    displayName: Setup
-    workingDirectory: '$(Build.BinariesDirectory)'
-    env:
-      TEMP: $(Agent.TempDirectory)
-      ARCH: x86
-  - template: azure-pipelines/bash.yml
-    parameters:
-      environmentVariables:
-        BUILD_PATH: $(Agent.TempDirectory)\mingw32\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin
-        CMAKE_GENERATOR: MinGW Makefiles
-        CMAKE_OPTIONS: -DDEPRECATE_HARD=ON
-        SKIP_SSH_TESTS: true
-        SKIP_NEGOTIATE_TESTS: true

azure-pipelines/bash.yml

-# These are the steps used for building on machines with bash.
-steps:
-- bash: . '$(Build.SourcesDirectory)/ci/build.sh'
-  displayName: Build
-  workingDirectory: '$(Build.BinariesDirectory)'
-  env: ${{ parameters.environmentVariables }}
-- bash: . '$(Build.SourcesDirectory)/ci/test.sh'
-  displayName: Test
-  workingDirectory: '$(Build.BinariesDirectory)'
-  env: ${{ parameters.environmentVariables }}
-- task: PublishTestResults@2
-  displayName: Publish Test Results
-  condition: succeededOrFailed()
-  inputs:
-    testResultsFiles: 'results_*.xml'
-    searchFolder: '$(Build.BinariesDirectory)'
-    mergeTestResults: true

azure-pipelines/coverity.yml

-resources:
-- repo: self
-
-jobs:
-- job: coverity
-  displayName: 'Coverity'
-  pool:
-    vmImage: 'ubuntu-18.04'
-  steps:
-  - script: |
-     cd $(Build.SourcesDirectory)/ci/docker
-     docker build -t libgit2/xenial --build-arg BASE=ubuntu:xenial -f xenial .
-    displayName: 'Build Docker image'
-  - task: Docker@0
-    displayName: Analyze
-    inputs:
-      action: 'Run an image'
-      imageName: libgit2/xenial
-      volumes: |
-       $(Build.SourcesDirectory):/home/libgit2/source
-       $(Build.BinariesDirectory):/home/libgit2/build
-      envVars: |
-       COVERITY_TOKEN=$(COVERITY_TOKEN)
-      workDir: '/home/libgit2/build'
-      containerCommand: '/home/libgit2/source/ci/coverity.sh'
-      detached: false

azure-pipelines/docker.yml

-# These are the steps used in a container-based build in VSTS.
-steps:
-- ${{ if eq(parameters.qemu, 'true') }}:
-  - script: docker run --rm --privileged multiarch/qemu-user-static:register --reset
-    displayName: 'Register Docker QEMU'
-
-- task: cache@2
-  displayName: Cache Docker layers
-  inputs:
-    key: docker
-    path: /tmp/dockercache
-- script: |
-    if [ -f /tmp/dockercache/${{parameters.docker.image}}.tar ]; then docker load < /tmp/dockercache/${{parameters.docker.image}}.tar; fi
-  displayName: 'Load Docker cache'
-- script: |
-    cd $(Build.SourcesDirectory)/ci/docker &&
-    docker build -t libgit2/${{parameters.docker.image}} --build-arg BASE=${{parameters.docker.base}} -f ${{parameters.docker.image}} . &&
-    if [ ! -d /tmp/dockercache ]; then mkdir /tmp/dockercache; fi &&
-    docker save libgit2/${{parameters.docker.image}} $(docker history -q libgit2/${{parameters.docker.image}} | grep -v '<missing>') > /tmp/dockercache/${{parameters.docker.image}}.tar
-  displayName: 'Build Docker image'
-- task: docker@0
-  displayName: Build
-  inputs:
-    action: 'Run an image'
-    imageName: libgit2/${{ parameters.docker.image }}
-    volumes: |
-     $(Build.SourcesDirectory):/home/libgit2/source
-     $(Build.BinariesDirectory):/home/libgit2/build
-    envVars: ${{ parameters.environmentVariables }}
-    workDir: '/home/libgit2/build'
-    containerCommand: '/home/libgit2/source/ci/build.sh'
-    detached: false
-- task: docker@0
-  displayName: Test
-  inputs:
-    action: 'Run an image'
-    imageName: libgit2/${{ parameters.docker.image }}
-    volumes: |
-     $(Build.SourcesDirectory):/home/libgit2/source
-     $(Build.BinariesDirectory):/home/libgit2/build
-    envVars: ${{ parameters.environmentVariables }}
-    workDir: '/home/libgit2/build'
-    containerCommand: '/home/libgit2/source/ci/test.sh'
-    detached: false
-- task: publishtestresults@2
-  displayName: Publish Test Results
-  condition: succeededOrFailed()
-  inputs:
-    testResultsFiles: 'results_*.xml'
-    searchFolder: '$(Build.BinariesDirectory)'
-    mergeTestResults: true

azure-pipelines/nightly.yml

-resources:
-- repo: self
-
-jobs:
-- job: linux_amd64_xenial_gcc_openssl
-  displayName: 'Linux (amd64; Xenial; GCC; OpenSSL)'
-  pool:
-    vmImage: 'ubuntu-18.04'
-  steps:
-  - template: docker.yml
-    parameters:
-      docker:
-        image: xenial
-        base: ubuntu:xenial
-      environmentVariables: |
-       CC=gcc
-       CMAKE_GENERATOR=Ninja
-       CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
-       RUN_INVASIVE_TESTS=true
-
-- job: linux_amd64_xenial_gcc_mbedtls
-  displayName: 'Linux (amd64; Xenial; GCC; mbedTLS)'
-  pool:
-    vmImage: 'ubuntu-18.04'
-  steps:
-  - template: docker.yml
-    parameters:
-      docker:
-        image: xenial
-        base: ubuntu:xenial
-      environmentVariables: |
-       CC=gcc
-       CMAKE_GENERATOR=Ninja
-       CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
-       RUN_INVASIVE_TESTS=true
-
-- job: linux_amd64_xenial_clang_openssl
-  displayName: 'Linux (amd64; Xenial; Clang; OpenSSL)'
-  pool:
-    vmImage: 'ubuntu-18.04'
-  steps:
-  - template: docker.yml
-    parameters:
-      docker:
-        image: xenial
-        base: ubuntu:xenial
-      environmentVariables: |
-       CC=clang
-       CMAKE_GENERATOR=Ninja
-       CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
-       RUN_INVASIVE_TESTS=true
-
-- job: linux_amd64_xenial_clang_mbedtls
-  displayName: 'Linux (amd64; Xenial; Clang; mbedTLS)'
-  pool:
-    vmImage: 'ubuntu-18.04'
-  steps:
-  - template: docker.yml
-    parameters:
-      docker:
-        image: xenial
-        base: ubuntu:xenial
-      environmentVariables: |
-       CC=clang
-       CMAKE_GENERATOR=Ninja
-       CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
-       RUN_INVASIVE_TESTS=true
-
-- job: macos
-  displayName: 'macOS (amd64; 10.15)'
-  pool:
-    vmImage: 'macOS-10.15'
-  steps:
-  - bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh'
-    displayName: Setup
-  - template: bash.yml
-    parameters:
-      environmentVariables:
-        TMPDIR: $(Agent.TempDirectory)
-        PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig
-        CMAKE_GENERATOR: Ninja
-        CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks -DUSE_GSSAPI=ON
-        RUN_INVASIVE_TESTS: true
-        SKIP_SSH_TESTS: true
-
-- job: windows_vs_amd64
-  displayName: 'Windows (amd64; Visual Studio)'
-  pool:
-    vmImage: 'vs2017-win2016'
-  steps:
-  - template: bash.yml
-    parameters:
-      environmentVariables:
-        CMAKE_GENERATOR: Visual Studio 15 2017
-        CMAKE_OPTIONS: -A x64 -DWIN32_LEAKCHECK=ON -DDEPRECATE_HARD=ON
-        RUN_INVASIVE_TESTS: true
-        SKIP_SSH_TESTS: true
-
-- job: windows_vs_x86
-  displayName: 'Windows (x86; Visual Studio)'
-  pool:
-    vmImage: 'vs2017-win2016'
-  steps:
-  - template: bash.yml
-    parameters:
-      environmentVariables:
-        CMAKE_GENERATOR: Visual Studio 15 2017
-        CMAKE_OPTIONS: -A Win32 -DWIN32_LEAKCHECK=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS
-        RUN_INVASIVE_TESTS: true
-        SKIP_SSH_TESTS: true
-
-- job: windows_mingw_amd64
-  displayName: 'Windows (amd64; MinGW)'
-  pool:
-    vmImage: 'vs2017-win2016'
-  steps:
-  - bash: . '$(Build.SourcesDirectory)\ci\setup-mingw.sh'
-    displayName: Setup
-    env:
-      TEMP: $(Agent.TempDirectory)
-      ARCH: amd64
-  - template: bash.yml
-    parameters:
-      environmentVariables:
-        BUILD_PATH: $(Agent.TempDirectory)\mingw64\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin
-        CMAKE_GENERATOR: MinGW Makefiles
-        CMAKE_OPTIONS: -DDEPRECATE_HARD=ON
-        RUN_INVASIVE_TESTS: true
-        SKIP_SSH_TESTS: true
-
-- job: windows_mingw_x86
-  displayName: 'Windows (x86; MinGW)'
-  pool:
-    vmImage: 'vs2017-win2016'
-  steps:
-  - bash: . '$(Build.SourcesDirectory)\ci\setup-mingw.sh'
-    displayName: Setup
-    workingDirectory: '$(Build.BinariesDirectory)'
-    env:
-      TEMP: $(Agent.TempDirectory)
-      ARCH: x86
-  - template: bash.yml
-    parameters:
-      environmentVariables:
-        BUILD_PATH: $(Agent.TempDirectory)\mingw32\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin
-        CMAKE_GENERATOR: MinGW Makefiles
-        CMAKE_OPTIONS: -DDEPRECATE_HARD=ON
-        RUN_INVASIVE_TESTS: true
-        SKIP_SSH_TESTS: true
-
-- job: linux_x86_bionic_gcc_openssl
-  displayName: 'Linux (x86; Bionic; GCC; OpenSSL)'
-  pool:
-    vmImage: 'ubuntu-18.04'
-  steps:
-  - template: docker.yml
-    parameters:
-      qemu: 'true'
-      docker:
-        image: bionic
-        base: multiarch/ubuntu-core:x86-bionic
-      environmentVariables: |
-       CC=gcc
-       CMAKE_GENERATOR=Ninja
-       CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
-       RUN_INVASIVE_TESTS=true
-
-- job: linux_x86_bionic_clang_openssl
-  displayName: 'Linux (x86; Bionic; Clang; OpenSSL)'
-  pool:
-    vmImage: 'ubuntu-18.04'
-  steps:
-  - template: docker.yml
-    parameters:
-      qemu: 'true'
-      docker:
-        image: bionic
-        base: multiarch/ubuntu-core:x86-bionic
-      environmentVariables: |
-       CC=clang
-       CMAKE_GENERATOR=Ninja
-       CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
-       RUN_INVASIVE_TESTS=true
-
-- job: linux_arm32_bionic_gcc_openssl
-  displayName: 'Linux (arm32; Bionic; GCC; OpenSSL)'
-  pool:
-    vmImage: 'ubuntu-18.04'
-  steps:
-  - template: docker.yml
-    parameters:
-      qemu: 'true'
-      docker:
-        image: bionic
-        base: multiarch/ubuntu-core:armhf-bionic
-      environmentVariables: |
-       CC=gcc
-       CMAKE_GENERATOR=Ninja
-       CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON
-       RUN_INVASIVE_TESTS=true
-       SKIP_PROXY_TESTS=true
-
-- job: linux_arm64_bionic_gcc_openssl
-  displayName: 'Linux (arm64; Bionic; GCC; OpenSSL)'
-  pool:
-    vmImage: 'ubuntu-18.04'
-  steps:
-  - template: docker.yml
-    parameters:
-      qemu: 'true'
-      docker:
-        image: bionic
-        base: multiarch/ubuntu-core:arm64-bionic
-      environmentVariables: |
-       CC=gcc
-       CMAKE_GENERATOR=Ninja
-       CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON
-       RUN_INVASIVE_TESTS=true
-       SKIP_PROXY_TESTS=true

ci/docker/bionic

-FROM ubuntu:bionic AS apt
+ARG BASE=ubuntu:bionic
+FROM ${BASE} AS apt
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         clang \
@@ -6,7 +7,9 @@ RUN apt-get update && \
         curl \
         gcc \
         git \
+        krb5-user \
         libcurl4-openssl-dev \
+        libkrb5-dev \
         libpcre3-dev \
         libssh2-1-dev \
         libssl-dev \

ci/docker/docurium

-FROM ubuntu:bionic
+ARG BASE=ubuntu:bionic
+FROM ${BASE}
 RUN apt update && apt install -y cmake pkg-config ruby ruby-dev llvm libclang-dev libssl-dev python-pygments
 RUN gem install docurium

ci/docker/focal

-FROM ubuntu:focal AS apt
+ARG BASE=ubuntu:focal
+FROM ${BASE} AS apt
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         bzip2 \

ci/docker/xenial

-FROM ubuntu:xenial AS apt
+ARG BASE=ubuntu:xenial
+FROM ${BASE} AS apt
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         bzip2 \

ci/getcontainer.sh

@@ -2,22 +2,28 @@
 
 set -e
 
-DOCKERFILE_PATH=$1
+IMAGE_NAME=$1
+DOCKERFILE_PATH=$2
 
-if [ "${DOCKERFILE_PATH}" = "" ]; then
-	echo "usage: $0 dockerfile"
+if [ "${IMAGE_NAME}" = "" ]; then
+	echo "usage: $0 image_name [dockerfile]"
 	exit 1
 fi
 
+if [ "${DOCKERFILE_PATH}" = "" ]; then
+	DOCKERFILE_PATH="${IMAGE_NAME}"
+fi
+
 if [ "${DOCKER_REGISTRY}" = "" ]; then
 	echo "DOCKER_REGISTRY environment variable is unset."
 	echo "Not running inside GitHub Actions or misconfigured?"
 	exit 1
 fi
 
-DOCKER_CONTAINER="${GITHUB_REPOSITORY}/$(basename ${DOCKERFILE_PATH})"
+DOCKER_CONTAINER="${GITHUB_REPOSITORY}/${IMAGE_NAME}"
 DOCKER_REGISTRY_CONTAINER="${DOCKER_REGISTRY}/${DOCKER_CONTAINER}"
 
+echo "dockerfile=${DOCKERFILE_PATH}" >> $GITHUB_ENV
 echo "docker-container=${DOCKER_CONTAINER}" >> $GITHUB_ENV
 echo "docker-registry-container=${DOCKER_REGISTRY_CONTAINER}" >> $GITHUB_ENV