From c8df479ca43f40e19baa37cf324429143bf51987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=B8gaard?= Date: Thu, 8 Dec 2022 11:03:57 +0100 Subject: [PATCH 1/4] Specify Ubuntu 20.04 version, compared to recent default 22.04 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4f6fe4aee..f51224b96 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: build-icetray: name: Unit tests - IceTray needs: [ check-codeclimate-credentials ] - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: icecube/icetray:combo-stable steps: - name: Set environment variables From 9f9d11133861b2d106cf26bc3a67ee3fb76556af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=B8gaard?= Date: Thu, 8 Dec 2022 11:10:10 +0100 Subject: [PATCH 2/4] Debug --- .github/workflows/build.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f51224b96..2e22f4f5d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: build-icetray: name: Unit tests - IceTray needs: [ check-codeclimate-credentials ] - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest container: icecube/icetray:combo-stable steps: - name: Set environment variables @@ -44,6 +44,12 @@ jobs: echo "PYTHONPATH=/usr/local/icetray/lib:$PYTHONPATH" >> $GITHUB_ENV echo "LD_LIBRARY_PATH=/usr/local/icetray/lib:/usr/local/icetray/cernroot/lib:/usr/local/icetray/lib/tools:$LD_LIBRARY_PATH" >> $GITHUB_ENV - uses: actions/checkout@v3 + - name: Debug + run: | + which python + python -V + echo $PYTHONPATH + echo $PATH - name: Upgrade packages already installed on icecube/icetray run: | pip install --upgrade astropy # Installed version incompatible with numpy 1.23.0 [https://github.com/astropy/astropy/issues/12534] From e78341f99b90c39f2439b529b914dcea121950a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=B8gaard?= Date: Thu, 8 Dec 2022 11:25:01 +0100 Subject: [PATCH 3/4] Upgrade pip --- .github/actions/install-cpu/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-cpu/action.yml b/.github/actions/install-cpu/action.yml index 100fe63a7..44d0e9e73 100644 --- a/.github/actions/install-cpu/action.yml +++ b/.github/actions/install-cpu/action.yml @@ -26,7 +26,7 @@ runs: shell: bash - name: Install dependencies run: | - pip install --upgrade 'pip>=20,<22.1' + pip install --upgrade pip pip install wheel setuptools==59.5.0 shell: bash - name: Install package From ebcd9138f6a6ab4203bda41adf6e3758796f69af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=B8gaard?= Date: Thu, 8 Dec 2022 11:32:08 +0100 Subject: [PATCH 4/4] Clean up --- .github/actions/install-cpu/action.yml | 2 +- .github/workflows/build.yml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/actions/install-cpu/action.yml b/.github/actions/install-cpu/action.yml index 44d0e9e73..474761265 100644 --- a/.github/actions/install-cpu/action.yml +++ b/.github/actions/install-cpu/action.yml @@ -26,7 +26,7 @@ runs: shell: bash - name: Install dependencies run: | - pip install --upgrade pip + pip install --upgrade pip>=20 pip install wheel setuptools==59.5.0 shell: bash - name: Install package diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e22f4f5d..4f6fe4aee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,12 +44,6 @@ jobs: echo "PYTHONPATH=/usr/local/icetray/lib:$PYTHONPATH" >> $GITHUB_ENV echo "LD_LIBRARY_PATH=/usr/local/icetray/lib:/usr/local/icetray/cernroot/lib:/usr/local/icetray/lib/tools:$LD_LIBRARY_PATH" >> $GITHUB_ENV - uses: actions/checkout@v3 - - name: Debug - run: | - which python - python -V - echo $PYTHONPATH - echo $PATH - name: Upgrade packages already installed on icecube/icetray run: | pip install --upgrade astropy # Installed version incompatible with numpy 1.23.0 [https://github.com/astropy/astropy/issues/12534]