Commit 3d6b9035 by Edward Thomson

ci: stop using deprecated set-env in GitHub Actions

(And move the ci scripts into the `ci` directory.)
parent 2a516790
......@@ -10,7 +10,7 @@ on:
env:
docker-registry: docker.pkg.github.com
docker-config-path: azure-pipelines/docker
docker-config-path: ci/docker
jobs:
# Build the docker container images that we will use for our Linux
......@@ -38,7 +38,7 @@ jobs:
fetch-depth: 0
if: github.event_name == 'push'
- name: Download existing container
run: azure-pipelines/getcontainer.sh ${{ env.docker-config-path }}/${{ matrix.container }}
run: ci/getcontainer.sh ${{ env.docker-config-path }}/${{ matrix.container }}
env:
DOCKER_REGISTRY: ${{ env.docker-registry }}
GITHUB_TOKEN: ${{ secrets.github_token }}
......@@ -166,11 +166,11 @@ jobs:
with:
fetch-depth: 0
- name: Set up build environment
run: azure-pipelines/setup-${{ matrix.platform.setup-script }}.sh
run: ci/setup-${{ matrix.platform.setup-script }}.sh
shell: bash
if: matrix.platform.setup-script != ''
- name: Download container
run: azure-pipelines/getcontainer.sh ${{ env.docker-config-path }}/${{ matrix.platform.image }}
run: ci/getcontainer.sh ${{ env.docker-config-path }}/${{ matrix.platform.image }}
env:
DOCKER_REGISTRY: ${{ env.docker-registry }}
GITHUB_TOKEN: ${{ secrets.github_token }}
......@@ -198,11 +198,11 @@ jobs:
-e SKIP_NEGOTIATE_TESTS \
-e SKIP_SSH_TESTS \
${{ env.docker-registry-container-sha }} \
/bin/bash -c "mkdir build && cd build && ../azure-pipelines/build.sh && ../azure-pipelines/test.sh"
/bin/bash -c "mkdir build && cd build && ../ci/build.sh && ../ci/test.sh"
else
mkdir build && cd build
../azure-pipelines/build.sh
../azure-pipelines/test.sh
../ci/build.sh
../ci/test.sh
fi
shell: bash
......
# These are the steps used for building on machines with bash.
steps:
- bash: . '$(Build.SourcesDirectory)/azure-pipelines/build.sh'
- bash: . '$(Build.SourcesDirectory)/ci/build.sh'
displayName: Build
workingDirectory: '$(Build.BinariesDirectory)'
env: ${{ parameters.environmentVariables }}
- bash: . '$(Build.SourcesDirectory)/azure-pipelines/test.sh'
- bash: . '$(Build.SourcesDirectory)/ci/test.sh'
displayName: Test
workingDirectory: '$(Build.BinariesDirectory)'
env: ${{ parameters.environmentVariables }}
......
......@@ -8,7 +8,7 @@ jobs:
vmImage: 'ubuntu-18.04'
steps:
- script: |
cd $(Build.SourcesDirectory)/azure-pipelines/docker
cd $(Build.SourcesDirectory)/ci/docker
docker build -t libgit2/xenial --build-arg BASE=ubuntu:xenial -f xenial .
displayName: 'Build Docker image'
- task: Docker@0
......@@ -22,5 +22,5 @@ jobs:
envVars: |
COVERITY_TOKEN=$(COVERITY_TOKEN)
workDir: '/home/libgit2/build'
containerCommand: '/home/libgit2/source/azure-pipelines/coverity.sh'
containerCommand: '/home/libgit2/source/ci/coverity.sh'
detached: false
......@@ -13,7 +13,7 @@ steps:
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)/azure-pipelines/docker &&
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
......@@ -28,7 +28,7 @@ steps:
$(Build.BinariesDirectory):/home/libgit2/build
envVars: ${{ parameters.environmentVariables }}
workDir: '/home/libgit2/build'
containerCommand: '/home/libgit2/source/azure-pipelines/build.sh'
containerCommand: '/home/libgit2/source/ci/build.sh'
detached: false
- task: docker@0
displayName: Test
......@@ -40,7 +40,7 @@ steps:
$(Build.BinariesDirectory):/home/libgit2/build
envVars: ${{ parameters.environmentVariables }}
workDir: '/home/libgit2/build'
containerCommand: '/home/libgit2/source/azure-pipelines/test.sh'
containerCommand: '/home/libgit2/source/ci/test.sh'
detached: false
- task: publishtestresults@2
displayName: Publish Test Results
......
......@@ -71,7 +71,7 @@ jobs:
pool:
vmImage: 'macOS-10.15'
steps:
- bash: . '$(Build.SourcesDirectory)/azure-pipelines/setup-osx.sh'
- bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh'
displayName: Setup
- template: bash.yml
parameters:
......@@ -114,7 +114,7 @@ jobs:
pool:
vmImage: 'vs2017-win2016'
steps:
- bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh'
- bash: . '$(Build.SourcesDirectory)\ci\setup-mingw.sh'
displayName: Setup
env:
TEMP: $(Agent.TempDirectory)
......@@ -133,7 +133,7 @@ jobs:
pool:
vmImage: 'vs2017-win2016'
steps:
- bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh'
- bash: . '$(Build.SourcesDirectory)\ci\setup-mingw.sh'
displayName: Setup
workingDirectory: '$(Build.BinariesDirectory)'
env:
......
......@@ -18,18 +18,18 @@ fi
DOCKER_CONTAINER="${GITHUB_REPOSITORY}/$(basename ${DOCKERFILE_PATH})"
DOCKER_REGISTRY_CONTAINER="${DOCKER_REGISTRY}/${DOCKER_CONTAINER}"
echo "::set-env name=docker-container::${DOCKER_CONTAINER}"
echo "::set-env name=docker-registry-container::${DOCKER_REGISTRY_CONTAINER}"
echo "docker-container=${DOCKER_CONTAINER}" >> $GITHUB_ENV
echo "docker-registry-container=${DOCKER_REGISTRY_CONTAINER}" >> $GITHUB_ENV
# Identify the last git commit that touched the Dockerfiles
# Use this as a hash to identify the resulting docker containers
DOCKER_SHA=$(git log -1 --pretty=format:"%h" -- "${DOCKERFILE_PATH}")
echo "::set-env name=docker-sha::${DOCKER_SHA}"
echo "docker-sha=${DOCKER_SHA}" >> $GITHUB_ENV
DOCKER_REGISTRY_CONTAINER_SHA="${DOCKER_REGISTRY_CONTAINER}:${DOCKER_SHA}"
echo "::set-env name=docker-registry-container-sha::${DOCKER_REGISTRY_CONTAINER_SHA}"
echo "::set-env name=docker-registry-container-latest::${DOCKER_REGISTRY_CONTAINER}:latest"
echo "docker-registry-container-sha=${DOCKER_REGISTRY_CONTAINER_SHA}" >> $GITHUB_ENV
echo "docker-registry-container-latest=${DOCKER_REGISTRY_CONTAINER}:latest" >> $GITHUB_ENV
exists="true"
docker login https://${DOCKER_REGISTRY} -u ${GITHUB_ACTOR} -p ${GITHUB_TOKEN} || exists="false"
......@@ -39,7 +39,7 @@ if [ "${exists}" != "false" ]; then
fi
if [ "${exists}" = "true" ]; then
echo "::set-env name=docker-container-exists::true"
echo "docker-container-exists=true" >> $GITHUB_ENV
else
echo "::set-env name=docker-container-exists::false"
echo "docker-container-exists=false" >> $GITHUB_ENV
fi
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