Skip to content

Commit a478861

Browse files
authored
Merge pull request #602 from per1234/use-poetry_install-deps-task
Remove obsolete instructions re: setting framework versions in workflows
2 parents 409dd38 + a908868 commit a478861

11 files changed

+29
-26
lines changed

workflow-templates/check-go-task.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ Install the [`check-go-task.yml`](check-go-task.yml) GitHub Actions workflow to
1919

2020
### Configuration
2121

22-
Configure the version of Go used for development of the project in the `env.GO_VERSION` field of `check-go-task.yml`.
23-
2422
If the project contains Go modules in paths other than the root of the repository, add their paths to the [job matrices](https://docs.github.com/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstrategymatrix) of `check-go-task.yml` at:
2523

2624
- `jobs.check-errors.strategy.matrix.module[].path`

workflow-templates/check-python-task.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ Commit the resulting `pyproject.toml` and `poetry.lock` files.
4545

4646
### Configuration
4747

48-
#### Workflow
49-
50-
Set the version of Python used by the project in the `env.PYTHON_VERSION` field of `check-python-task.yml`.
51-
5248
#### black
5349

5450
Add the following to `pyproject.toml`:

workflow-templates/deploy-cobra-mkdocs-versioned-poetry.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ Install the [`deploy-cobra-mkdocs-versioned-poetry.yml`](deploy-cobra-mkdocs-ver
2727
- Install to: repository root (or merge into the existing `Taskfile.yml`).
2828
- [`Taskfile.yml`](assets/check-prettier-formatting-task/Taskfile.yml) - documentation formatting task.
2929
- Merge into `Taskfile.yml`
30+
- [`Taskfile.yml`](assets/poetry-task/Taskfile.yml) - Python package dependency management tasks.
31+
- Merge into `Taskfile.yml`
3032
- [`docsgen`](assets/cobra/docsgen) - command line reference generator.
3133
- Install to: `docsgen/`
3234

@@ -38,8 +40,6 @@ See the ["Deploy Website" workflow (versioned, MkDocs, Poetry) documentation](de
3840

3941
#### Workflow
4042

41-
Configure the version of Go used for development of the project in the `env.GO_VERSION` field of `deploy-cobra-mkdocs-versioned-poetry.yml`.
42-
4343
#### Taskfile
4444

4545
Set the `PROJECT_NAME` variable to the project name.

workflow-templates/deploy-cobra-mkdocs-versioned-poetry.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,10 @@ jobs:
8282
- name: Create all generated documentation content
8383
run: task docs:generate
8484

85-
- name: Install Python dependencies
86-
run: poetry install --no-root
85+
- name: Install Dependencies
86+
run: |
87+
task \
88+
poetry:install-deps
8789
8890
- name: Determine versioning parameters
8991
id: determine-versioning

workflow-templates/deploy-mkdocs-poetry.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Install the [`deploy-mkdocs-poetry.yml`](deploy-mkdocs-poetry.yml) GitHub Action
1212

1313
### Assets
1414

15+
- [`Taskfile.yml`](assets/poetry-task/Taskfile.yml) - Python package dependency management tasks.
16+
- Install to: repository root (or merge into the existing `Taskfile.yml`).
1517
- [`mkdocs.yml`](assets/mkdocs/mkdocs.yml) - base MkDocs configuration file.
1618
- Install to: repository root
1719
- [`icon_mac_light.png`](assets/mkdocs/icon_mac_light.png) - Arduino logo for the website. **NOTE**: only for use in official Arduino projects. Community projects should use [the Community Logo](https://www.arduino.cc/en/Trademark/CommunityLogo).

workflow-templates/deploy-mkdocs-poetry.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
- "mkdocs.ya?ml"
1313
- "poetry.lock"
1414
- "pyproject.toml"
15+
- "Taskfile.ya?ml"
1516
- "docs/**"
1617
workflow_dispatch:
1718
repository_dispatch:
@@ -31,11 +32,19 @@ jobs:
3132
with:
3233
python-version-file: pyproject.toml
3334

35+
- name: Install Task
36+
uses: arduino/setup-task@v2
37+
with:
38+
repo-token: ${{ secrets.GITHUB_TOKEN }}
39+
version: 3.x
40+
3441
- name: Install Poetry
3542
run: pip install poetry
3643

3744
- name: Install Dependencies
38-
run: poetry install --no-root
45+
run: |
46+
task \
47+
poetry:install-deps
3948
4049
- name: Deploy website
4150
run: poetry run mkdocs gh-deploy

workflow-templates/deploy-mkdocs-versioned-poetry.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
- ".github/workflows/deploy-mkdocs-versioned-poetry.ya?ml"
1414
- "mkdocs.ya?ml"
1515
- "poetry.lock"
16+
- "Taskfile.ya?ml"
1617
- "pyproject.toml"
1718
# Run on branch or tag creation (will be filtered by the publish-determination job).
1819
create:
@@ -58,13 +59,21 @@ jobs:
5859
with:
5960
python-version-file: pyproject.toml
6061

62+
- name: Install Task
63+
uses: arduino/setup-task@v2
64+
with:
65+
repo-token: ${{ secrets.GITHUB_TOKEN }}
66+
version: 3.x
67+
6168
- name: Install Poetry
6269
run: |
6370
python -m pip install --upgrade pip
6471
python -m pip install poetry
6572
66-
- name: Install Python dependencies
67-
run: poetry install --no-root
73+
- name: Install Dependencies
74+
run: |
75+
task \
76+
poetry:install-deps
6877
6978
- name: Determine versioning parameters
7079
id: determine-versioning

workflow-templates/release-go-crosscompile-task.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ The following project-specific variables must be set/configured in `release-go-c
3535

3636
- `PROJECT_NAME`
3737
- `AWS_PLUGIN_TARGET`
38-
- `GO_VERSION`: version of Go used for development of the project, use at least [GO 1.16 to be able to use 64-bit ARM architecture on macOS](https://tip.golang.org/doc/go1.16#ports)
3938

4039
#### AWS IAM Role
4140

workflow-templates/test-go-integration-task.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,6 @@ Commit the resulting `pyproject.toml` and `poetry.lock` files.
4949

5050
### Configuration
5151

52-
#### Workflow
53-
54-
Configure the version of Go used for development of the project in the `env.GO_VERSION` field of `test-go-integration-task.yml`.
55-
56-
Configure the version of Python used for development of the project in the `env.PYTHON_VERSION` field of `test-go-integration-task.yml`.
57-
5852
#### Test helpers
5953

6054
Define the project's executable filename in the `executable_path` variable in `test_all.py`.

workflow-templates/test-go-task.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ Install the [`test-go-task.yml`](test-go-task.yml) GitHub Actions workflow to `.
2121

2222
#### Workflow
2323

24-
Configure the version of Go used for development of the project in the `env.GO_VERSION` field of `test-go-task.yml`.
25-
2624
If the project contains Go modules in paths other than the root of the repository, add their paths to the [job matrix](https://docs.github.com/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstrategymatrix) in `check-go-task.yml` at `jobs.test.strategy.matrix.module[].path` and the [Codecov flag](https://docs.codecov.com/docs/flags) to group their data under at `jobs.test.strategy.matrix.module[].codecov-flags`
2725

2826
Replace `TODO_REPO_OWNER/TODO_REPO_NAME` with the repository's name (e.g., `arduino/arduino-cli`) in the `codecov/codecov-action` action's `fail_ci_if_error` input in `test-go-task.yml`.

workflow-templates/test-python-poetry-task.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ poetry add --dev "pytest@^8.4.1"
4545

4646
Commit the resulting `pyproject.toml` and `poetry.lock` files.
4747

48-
### Configuration
49-
50-
Configure the version of Python used for development of the project in the `env.PYTHON_VERSION` field of `test-go-integration-task.yml`.
51-
5248
### Readme badge
5349

5450
Markdown badge:

0 commit comments

Comments
 (0)