From c9a879a3583764b7b8e8ada7d132e8d2e7091121 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 17 Dec 2022 20:30:07 +0100 Subject: [PATCH 1/6] github CI: use ubuntu-20.04 --- .github/workflows/black.yaml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/black.yaml b/.github/workflows/black.yaml index fbc8a997c..6ce8d0eb2 100644 --- a/.github/workflows/black.yaml +++ b/.github/workflows/black.yaml @@ -7,7 +7,7 @@ on: [push, pull_request] jobs: lint: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - uses: psf/black@22.6.0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 323f0e5a5..063f9a0b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ on: jobs: lint: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 timeout-minutes: 10 steps: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f38dcf0f8..ffec50297 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -14,7 +14,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 permissions: actions: read contents: read From 2f0a81617fd153f4d966ddcf27a8edb8a26f4bb2 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 17 Dec 2022 20:31:13 +0100 Subject: [PATCH 2/6] github CI: use actions/checkout@v3 --- .github/workflows/black.yaml | 2 +- .github/workflows/ci.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/black.yaml b/.github/workflows/black.yaml index 6ce8d0eb2..999e61e02 100644 --- a/.github/workflows/black.yaml +++ b/.github/workflows/black.yaml @@ -9,5 +9,5 @@ jobs: lint: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: psf/black@22.6.0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 063f9a0b6..b567545f5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: timeout-minutes: 10 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python uses: actions/setup-python@v2 with: @@ -77,7 +77,7 @@ jobs: timeout-minutes: 40 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # just fetching 1 commit is not enough for setuptools-scm, so we fetch all fetch-depth: 0 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ffec50297..580c4a74b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -29,7 +29,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: # just fetching 1 commit is not enough for setuptools-scm, so we fetch all fetch-depth: 0 From 626a5c9229a3b9076eea9463a376da81d10ece02 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 17 Dec 2022 20:31:58 +0100 Subject: [PATCH 3/6] github CI: use actions/setup-python@v4 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b567545f5..6ac939031 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.9 - name: Lint with flake8 @@ -82,7 +82,7 @@ jobs: # just fetching 1 commit is not enough for setuptools-scm, so we fetch all fetch-depth: 0 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Cache pip diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 580c4a74b..5ab90bd5d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -34,7 +34,7 @@ jobs: # just fetching 1 commit is not enough for setuptools-scm, so we fetch all fetch-depth: 0 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.9 - name: Cache pip From 6041928c0ac1ac42b1338977e9db03087940c21e Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 17 Dec 2022 20:32:35 +0100 Subject: [PATCH 4/6] github CI: use actions/cache@v3 --- .github/workflows/ci.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ac939031..0490a056c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,7 +86,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Cache pip - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('requirements.d/development.txt') }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5ab90bd5d..95f72427b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,7 +38,7 @@ jobs: with: python-version: 3.9 - name: Cache pip - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('requirements.d/development.txt') }} From d959178e76b777ebdd5c1f8b96503698a8f7965b Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 17 Dec 2022 19:40:54 +0100 Subject: [PATCH 5/6] github CI: prepend to PKG_CONFIG_PATH --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0490a056c..84582e6ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,7 +70,7 @@ jobs: env: # Configure pkg-config to use OpenSSL from Homebrew - PKG_CONFIG_PATH: /usr/local/opt/openssl@1.1/lib/pkgconfig + PKG_CONFIG_PATH: "/usr/local/opt/openssl@1.1/lib/pkgconfig:$PKG_CONFIG_PATH" TOXENV: ${{ matrix.toxenv }} runs-on: ${{ matrix.os }} From b1d7cb4e1e72943939bfcd49f0672e9f1191e751 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 17 Dec 2022 19:58:02 +0100 Subject: [PATCH 6/6] github CI: set PKG_CONFIG_PATH again strange: on macOS, the globally set PKG_CONFIG_PATH was overwritten, thus the borg build did not find openssl any more. setting it here locally again works around the issue. --- .github/workflows/ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84582e6ea..059f686d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,10 +117,18 @@ jobs: python -m pip install --upgrade pip setuptools wheel pip install -r requirements.d/development.txt - name: Install borgbackup + env: + # we already have that in the global env, but something is broken and overwrites that. + # so, set it here, again. + PKG_CONFIG_PATH: "/usr/local/opt/openssl@1.1/lib/pkgconfig:$PKG_CONFIG_PATH" run: | # pip install -e . python setup.py -v develop - name: run tox env + env: + # we already have that in the global env, but something is broken and overwrites that. + # so, set it here, again. + PKG_CONFIG_PATH: "/usr/local/opt/openssl@1.1/lib/pkgconfig:$PKG_CONFIG_PATH" run: | # do not use fakeroot, but run as root. avoids the dreaded EISDIR sporadic failures. see #2482. #sudo -E bash -c "tox -e py"