From e6e7060d04df79cacf08b034980245ae4f623513 Mon Sep 17 00:00:00 2001 From: Marcel Loose Date: Fri, 26 Apr 2024 15:19:37 +0200 Subject: [PATCH] Fix CI (#267) * Fix CI Two other workflows also needed updating so that the git checkout is now shallow. * Add git to docker image, remove .git from .dockerignore --- .dockerignore | 1 - .github/workflows/linux.yml | 5 ++++- .github/workflows/osx.yml | 3 +++ .github/workflows/py3_casacore_master.docker | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index b2fc541..1fa9f84 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,3 @@ -.git .venv*/ venv/ .virtualenv*/ diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 224c0cc..078720e 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -16,7 +16,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - + with: + # Needed for `setuptools-scm` + fetch-depth: 0 + - name: Build container run: docker build . -t ${{ matrix.dist }} -f .github/workflows/${{ matrix.dist }}.docker diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index cfaf074..db588cc 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -15,6 +15,9 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 + with: + # Needed for `setuptools-scm` + fetch-depth: 0 - name: install homebrew packages run: | diff --git a/.github/workflows/py3_casacore_master.docker b/.github/workflows/py3_casacore_master.docker index bae72c2..1f53ab6 100644 --- a/.github/workflows/py3_casacore_master.docker +++ b/.github/workflows/py3_casacore_master.docker @@ -3,6 +3,7 @@ RUN apt-get update -y RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \ build-essential \ casacore-dev \ + git \ libboost-python-dev \ libcfitsio-dev \ liblapack-dev \