diff options
author | TW <tw@waldmann-edv.de> | 2022-12-17 21:39:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-17 21:39:07 +0100 |
commit | 5704c4d8874667b7e23e92e391906841543f1c15 (patch) | |
tree | cd598aaffd4c47cd8d2f67ae92c5ad5c73ebd69b /.github | |
parent | 28bf1db2c8476da8ebc4f1a0ef6fe272e59eebd8 (diff) | |
parent | 96d36e32cb9e5ede75e37bdbbb2ce1cde139c552 (diff) |
Merge pull request #7215 from ThomasWaldmann/github-actions-updates-1.2
GitHub actions updates (1.2-maint)
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/ci.yml | 22 | ||||
-rw-r--r-- | .github/workflows/codeql-analysis.yml | 8 |
2 files changed, 19 insertions, 11 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e53e94763..0fd17b8ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,13 +31,13 @@ on: jobs: lint: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 timeout-minutes: 10 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.8 - name: Lint with flake8 @@ -70,23 +70,23 @@ 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 }} 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 - 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 - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('requirements.d/development.txt') }} @@ -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 pytest via tox + 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" diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f9403d0d4..e56ed2255 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 @@ -29,16 +29,16 @@ 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 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.8 - name: Cache pip - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('requirements.d/development.txt') }} |