Skip to content

Commit

Permalink
⬆️ Quick upgrade to actions
Browse files Browse the repository at this point in the history
They're still a bit of a mess but will sort out at a later date 🚀
  • Loading branch information
cp2004 committed Jun 19, 2024
1 parent 6111975 commit daab538
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 72 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ jobs:
name: 🔨 Build distribution
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: 🏗 Set up Python 3.10
uses: actions/setup-python@v4
- name: 🏗 Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"
- name: 🏗 Install build dependencies
run: |
python -m pip install wheel --user
Expand All @@ -26,7 +26,7 @@ jobs:
run: |
mv dist/Marlin\ EEPROM\ editor-*.zip dist/sdist.zip
- name: ⬆ Upload build result
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: dist
path: dist
Expand All @@ -36,7 +36,7 @@ jobs:
needs: build
strategy:
matrix:
python: ["3.7", "3.9", "3.11"]
python: ["3.7", "3.9", "3.11", "3.12"]
runs-on: ubuntu-latest
steps:
- name: 🏗 Set up Python ${{ matrix.python }}
Expand Down
81 changes: 15 additions & 66 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:
name: 🔨 Build distribution
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: 🏗 Set up Python 3.10
uses: actions/setup-python@v4
- name: 🏗 Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"
- name: 🏗 Install build dependencies
run: |
python -m pip install wheel --user
Expand All @@ -43,9 +43,9 @@ jobs:
octoprint: [">=1.5.0"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: 🏗 Set up Python ${{ matrix.python }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- name: 🏗 Set up test dependencies
Expand All @@ -57,73 +57,22 @@ jobs:
run: |
pytest
lint-black:
name: 🧹 black
pre-commit:
name: 🧹 pre-commit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: 🏗 Set up Python 3.10
uses: actions/setup-python@v1
- uses: actions/checkout@v4
- name: 🏗 Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"
- name: 🏗 Set up dev dependencies
run: |
python -m pip install wheel --user
pip install octoprint[develop]
- name: 🚀 Run black
- name: 🚀 Run pre-commit
run: |
pre-commit run --hook-stage manual black --all-files --show-diff-on-failure
lint-prettier:
name: 🧹 prettier
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: 🏗 Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: "3.10"
- name: 🏗 Set up dev dependencies
run: |
python -m pip install wheel --user
pip install octoprint[develop]
- name: 🚀 Run prettier
run: |
pre-commit run --hook-stage manual prettier --all-files --show-diff-on-failure
lint-isort:
name: 🧹 isort
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: 🏗 Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: "3.10"
- name: 🏗 Set up dev dependencies
run: |
python -m pip install wheel --user
pip install octoprint[develop]
- name: 🚀 Run isort
run: |
pre-commit run --hook-stage manual isort --all-files --show-diff-on-failure
lint-flake8:
name: 🧹 Flake8
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: 🏗 Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: "3.10"
- name: 🏗 Set up OctoPrint dev dependencies
run: |
python -m pip install wheel --user
pip install octoprint[develop]
- name: 🚀 Run flake8
run: |
pre-commit run --hook-stage manual flake8 --all-files
pre-commit run --all-files --show-diff-on-failure
test-install:
name: 🧪 Installation tests
Expand All @@ -134,7 +83,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 🏗 Set up Python ${{ matrix.python }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- name: ⬇ Download build result
Expand Down

0 comments on commit daab538

Please sign in to comment.