From 3d6b90359d1307736c9fd4488b1703d934a69a1a Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Wed, 18 Nov 2020 18:08:23 +0000 Subject: [PATCH] ci: stop using deprecated set-env in GitHub Actions (And move the ci scripts into the `ci` directory.) --- .github/workflows/main.yml | 14 +++++++------- azure-pipelines/bash.yml | 4 ++-- azure-pipelines/coverity.yml | 4 ++-- azure-pipelines/docker.yml | 6 +++--- azure-pipelines/nightly.yml | 6 +++--- {azure-pipelines => ci}/build.sh | 0 {azure-pipelines => ci}/coverity.sh | 0 {azure-pipelines => ci}/docker/bionic | 0 {azure-pipelines => ci}/docker/docurium | 0 {azure-pipelines => ci}/docker/entrypoint.sh | 0 {azure-pipelines => ci}/docker/focal | 0 {azure-pipelines => ci}/docker/xenial | 0 {azure-pipelines => ci}/getcontainer.sh | 14 +++++++------- {azure-pipelines => ci}/setup-mingw.sh | 0 {azure-pipelines => ci}/setup-osx.sh | 0 {azure-pipelines => ci}/test.sh | 0 16 files changed, 24 insertions(+), 24 deletions(-) rename {azure-pipelines => ci}/build.sh (100%) rename {azure-pipelines => ci}/coverity.sh (100%) rename {azure-pipelines => ci}/docker/bionic (100%) rename {azure-pipelines => ci}/docker/docurium (100%) rename {azure-pipelines => ci}/docker/entrypoint.sh (100%) rename {azure-pipelines => ci}/docker/focal (100%) rename {azure-pipelines => ci}/docker/xenial (100%) rename {azure-pipelines => ci}/getcontainer.sh (67%) rename {azure-pipelines => ci}/setup-mingw.sh (100%) rename {azure-pipelines => ci}/setup-osx.sh (100%) rename {azure-pipelines => ci}/test.sh (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 29507c8f0..a36a0a0ef 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 diff --git a/azure-pipelines/bash.yml b/azure-pipelines/bash.yml index 33a442b57..d776a3649 100644 --- a/azure-pipelines/bash.yml +++ b/azure-pipelines/bash.yml @@ -1,10 +1,10 @@ # 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 }} diff --git a/azure-pipelines/coverity.yml b/azure-pipelines/coverity.yml index a8747db73..466f43693 100644 --- a/azure-pipelines/coverity.yml +++ b/azure-pipelines/coverity.yml @@ -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 diff --git a/azure-pipelines/docker.yml b/azure-pipelines/docker.yml index 0f0885770..5bb58ee75 100644 --- a/azure-pipelines/docker.yml +++ b/azure-pipelines/docker.yml @@ -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 '') > /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 diff --git a/azure-pipelines/nightly.yml b/azure-pipelines/nightly.yml index a75a9cc24..97b447995 100644 --- a/azure-pipelines/nightly.yml +++ b/azure-pipelines/nightly.yml @@ -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: diff --git a/azure-pipelines/build.sh b/ci/build.sh similarity index 100% rename from azure-pipelines/build.sh rename to ci/build.sh diff --git a/azure-pipelines/coverity.sh b/ci/coverity.sh similarity index 100% rename from azure-pipelines/coverity.sh rename to ci/coverity.sh diff --git a/azure-pipelines/docker/bionic b/ci/docker/bionic similarity index 100% rename from azure-pipelines/docker/bionic rename to ci/docker/bionic diff --git a/azure-pipelines/docker/docurium b/ci/docker/docurium similarity index 100% rename from azure-pipelines/docker/docurium rename to ci/docker/docurium diff --git a/azure-pipelines/docker/entrypoint.sh b/ci/docker/entrypoint.sh similarity index 100% rename from azure-pipelines/docker/entrypoint.sh rename to ci/docker/entrypoint.sh diff --git a/azure-pipelines/docker/focal b/ci/docker/focal similarity index 100% rename from azure-pipelines/docker/focal rename to ci/docker/focal diff --git a/azure-pipelines/docker/xenial b/ci/docker/xenial similarity index 100% rename from azure-pipelines/docker/xenial rename to ci/docker/xenial diff --git a/azure-pipelines/getcontainer.sh b/ci/getcontainer.sh similarity index 67% rename from azure-pipelines/getcontainer.sh rename to ci/getcontainer.sh index bc93f4919..b259260f4 100755 --- a/azure-pipelines/getcontainer.sh +++ b/ci/getcontainer.sh @@ -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 diff --git a/azure-pipelines/setup-mingw.sh b/ci/setup-mingw.sh similarity index 100% rename from azure-pipelines/setup-mingw.sh rename to ci/setup-mingw.sh diff --git a/azure-pipelines/setup-osx.sh b/ci/setup-osx.sh similarity index 100% rename from azure-pipelines/setup-osx.sh rename to ci/setup-osx.sh diff --git a/azure-pipelines/test.sh b/ci/test.sh similarity index 100% rename from azure-pipelines/test.sh rename to ci/test.sh