Skip to content

Commit 0de3c38

Browse files
authored
Merge branch 'master' into master
2 parents 8747d18 + 33a2610 commit 0de3c38

2 files changed

Lines changed: 41 additions & 41 deletions

File tree

.github/workflows/push.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ jobs:
77
name: Check Formatting
88
runs-on: ubuntu-latest
99
steps:
10-
- name: Check out source repository
11-
uses: actions/checkout@v2
12-
- name: Set up Python environment
13-
uses: actions/setup-python@v3
14-
with:
15-
python-version: 3.9
16-
- name: flake8
17-
uses: py-actions/flake8@v2
18-
- name: black
19-
uses: psf/black@stable
20-
with:
21-
options: "--check --diff -l 90"
10+
- name: Check out source repository
11+
uses: actions/checkout@v3
12+
- name: Set up Python environment
13+
uses: actions/setup-python@v4
14+
with:
15+
python-version: 3.9
16+
- name: flake8
17+
uses: py-actions/flake8@v2
18+
- name: black
19+
uses: psf/black@stable
20+
with:
21+
options: '--check --diff -l 90'
2222

2323
build_wheels:
2424
name: Build wheel on ${{matrix.platform}}
@@ -28,11 +28,11 @@ jobs:
2828
matrix:
2929
platform: [ubuntu-latest, macos-latest, windows-latest]
3030
steps:
31-
- uses: actions/checkout@v2
32-
- name: Build wheels
33-
uses: pypa/cibuildwheel@v2.12.0
34-
env:
35-
CIBW_ARCHS_MACOS: 'x86_64 arm64'
36-
- uses: actions/upload-artifact@v3
37-
with:
38-
path: ./wheelhouse/*.whl
31+
- uses: actions/checkout@v3
32+
- name: Build wheels
33+
uses: pypa/cibuildwheel@v2.12.0
34+
env:
35+
CIBW_ARCHS_MACOS: 'x86_64 arm64'
36+
- uses: actions/upload-artifact@v3
37+
with:
38+
path: ./wheelhouse/*.whl

.github/workflows/release.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@master
14+
uses: actions/checkout@v3
1515
with:
1616
fetch-depth: 2
1717
- name: Get changed files
1818
id: changed-files
19-
uses: tj-actions/changed-files@v5.1
19+
uses: tj-actions/changed-files@v35.4.1
2020
- name: Tag Version
2121
if: contains(steps.changed-files.outputs.modified_files, 'src/fcl/version.py')
2222
id: set_tag
2323
run: |
2424
export VER=v$(python -c "exec(open('src/fcl/version.py','r').read());print(__version__)")
25-
echo "::set-output name=tag_name::${VER}"
25+
echo echo "tag_name=${VER}" >> $GITHUB_OUTPUT
2626
- name: Create Release
2727
if: contains(steps.changed-files.outputs.modified_files, 'src/fcl/version.py')
2828
id: create_release
@@ -46,23 +46,23 @@ jobs:
4646
matrix:
4747
platform: [ubuntu-latest, macos-latest, windows-latest]
4848
steps:
49-
- uses: actions/checkout@v2
50-
- name: Build wheels
51-
uses: pypa/cibuildwheel@v2.12.0
52-
env:
53-
CIBW_ARCHS_MACOS: 'x86_64 arm64'
54-
- uses: actions/upload-artifact@v3
55-
with:
56-
path: ./wheelhouse/*.whl
57-
- uses: xresloader/upload-to-github-release@v1
58-
env:
59-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
60-
with:
61-
file: ./wheelhouse/*.whl
62-
overwrite: true
63-
draft: false
64-
update_latest_release: true
65-
49+
- uses: actions/checkout@v3
50+
- name: Build wheels
51+
uses: pypa/cibuildwheel@v2.12.0
52+
env:
53+
CIBW_ARCHS_MACOS: 'x86_64 arm64'
54+
- uses: actions/upload-artifact@v3
55+
with:
56+
path: ./wheelhouse/*.whl
57+
- uses: xresloader/upload-to-github-release@v1
58+
env:
59+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
60+
with:
61+
file: ./wheelhouse/*.whl
62+
overwrite: true
63+
draft: false
64+
update_latest_release: true
65+
6666
upload_pypi:
6767
if: contains(needs.create_release.outputs.mod_files, 'src/fcl/version.py')
6868
needs: [create_release, build_wheels]
@@ -72,7 +72,7 @@ jobs:
7272
with:
7373
name: artifact
7474
path: dist
75-
- uses: pypa/gh-action-pypi-publish@v1.5.0
75+
- uses: pypa/gh-action-pypi-publish@v1.6.4
7676
with:
7777
user: __token__
7878
password: ${{ secrets.PYPI_API_TOKEN }}

0 commit comments

Comments
 (0)