Skip to content

Commit

Permalink
Merge e70e096 into e73d582
Browse files Browse the repository at this point in the history
  • Loading branch information
Takishima committed Oct 27, 2022
2 parents e73d582 + e70e096 commit db17a35
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 30 deletions.
19 changes: 7 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,10 @@ jobs:
with:
python-version: ${{ matrix.python }}
architecture: 'x64'

- name: Get pip cache dir
id: pip-cache
run: |
echo "::set-output name=dir::$(python -m pip cache dir)"
- name: Cache wheels
uses: actions/cache@v3
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-${{ matrix.python }}-pip-${{ hashFiles('**/setup.cfg') }}
restore-keys: ${{ runner.os }}-${{ matrix.python }}-pip-
cache: 'pip'
cache-dependency-path: |
setup.cfg
pyproject.toml
- name: Generate requirement file (Unix)
if: runner.os != 'Windows'
Expand Down Expand Up @@ -312,6 +304,9 @@ jobs:
git fetch --depth=1 origin +refs/tags/*:refs/tags/*
- uses: actions/setup-python@v4
with:
python-version: '3.x'
architecture: 'x64'

- name: Install docs & setup requirements
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/draft_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Install git-flow
run: sudo apt update && sudo apt install -y git-flow

- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Configure git-flow
run: |
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,22 @@ jobs:
name: Format and static analysis
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Get history and tags for SCM versioning to work
if: ${{ !env.ACT }}
run: |
git fetch --prune --unshallow
git fetch --depth=1 origin +refs/tags/*:refs/tags/*
- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: '3.x'

- name: Install pre-commit
run: python3 -m pip install --upgrade pre-commit 'virtualenv!=20.11'

- name: Cache pre-commit hooks
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.cache/pre-commit
key: pre-commit-${{ hashFiles('**/.pre-commit-config.yaml') }}
Expand All @@ -46,7 +49,7 @@ jobs:
CXX: clang++

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Prepare env
run: >
Expand Down
26 changes: 15 additions & 11 deletions .github/workflows/publish_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ jobs:
with:
platforms: arm64

- uses: actions/checkout@v2
- uses: actions/checkout@v3
if: github.event_name != 'workflow_dispatch'

- uses: actions/checkout@v2
- uses: actions/checkout@v3
if: github.event_name == 'workflow_dispatch'
with:
ref: 'master'
Expand Down Expand Up @@ -82,7 +82,9 @@ jobs:
# ========================================================================

- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: '3.x'

- name: Install Python packages
run: python -m pip install -U --prefer-binary pip setuptools build wheel twine 'cibuildwheel<3,>=2'
Expand Down Expand Up @@ -113,21 +115,21 @@ jobs:
CIBW_TEST_SKIP: '*'

- name: Files for Pypi upload
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: steps.src-dist.outcome == 'success'
with:
name: pypy_wheels
path: ./dist

- name: Binary wheels
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: steps.binary-dist.outcome == 'success'
with:
name: wheels
path: ./binary_dist

- name: Binary wheels that failed tests
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: steps.failed-dist.outcome == 'success'
with:
name: failed_wheels
Expand Down Expand Up @@ -175,17 +177,17 @@ jobs:
# ------------------------------------------------------------------------
# Checkout repository to get CHANGELOG

- uses: actions/checkout@v2
- uses: actions/checkout@v3
if: github.event_name != 'workflow_dispatch'

- uses: actions/checkout@v2
- uses: actions/checkout@v3
if: github.event_name == 'workflow_dispatch'
with:
ref: 'master'

# ------------------------------------------------------------------------

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3

# Code below inspired from this action:
# - uses: taiki-e/create-gh-release-action@v1
Expand Down Expand Up @@ -220,9 +222,11 @@ jobs:
runs-on: ubuntu-latest
needs: release
steps:
- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: '3.x'

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3

- name: Publish standard package
uses: pypa/gh-action-pypi-publish@release/v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
if: github.ref != 'refs/heads/master'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- id: changelog-enforcer
uses: dangoslen/changelog-enforcer@v3
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Repository

- Update GitHub workflow action versions
- Update all GitHub workflow action versions

## [v0.8.0] - 2022-10-18

Expand Down

0 comments on commit db17a35

Please sign in to comment.