Skip to content

Commit 87e221f

Browse files
Merge pull request #5 from nicholasmhughes/copier-profile
Copier profile
2 parents bde0426 + c8db7c6 commit 87e221f

File tree

16 files changed

+65
-381
lines changed

16 files changed

+65
-381
lines changed

.copier-answers.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Autogenerated. Do not edit this by hand, use `copier update`.
22
---
3-
_commit: 0.2.6
3+
_commit: 0.2.7
44
_src_path: https://github.com/lkubb/salt-extension-copier
55
author: EITR Technologies, LLC
66
author_email: devops@eitr.tech
@@ -20,3 +20,4 @@ ssh_fixtures: false
2020
summary: Salt Extension for interacting with Freezer
2121
tracker_url: https://github.com/salt-extensions/saltext-freezer/issues
2222
url: https://github.com/salt-extensions/saltext-freezer
23+
workflows: org

.github/workflows/pr.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
name: Pull Request or Push
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- 'main' # Run on pushes to main
7+
tags-ignore:
8+
- '*' # Ignore pushes to tags
9+
pull_request:
410

511
jobs:
6-
ci:
12+
call_central_workflow:
713
name: CI
814
uses: salt-extensions/central-artifacts/.github/workflows/ci.yml@main
915
permissions:

.github/workflows/tag.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,29 @@ name: Tagged Releases
33
on:
44
push:
55
tags:
6-
- "v*"
6+
- "v*" # Only tags starting with "v" for "v1.0.0", etc.
77

88
jobs:
9-
ci:
9+
get_tag_version:
1010
runs-on: ubuntu-latest
11+
outputs:
12+
version: ${{ steps.get_version.outputs.version }}
1113
steps:
1214
- name: Checkout code
1315
uses: actions/checkout@v4
1416

1517
- name: Extract tag name
1618
id: get_version
17-
run: echo "VERSION=$(echo ${GITHUB_REF#refs/tags/v})" >> $GITHUB_ENV
19+
run: echo "::set-output name=version::$(echo ${GITHUB_REF#refs/tags/v})"
1820

19-
- name: CI
20-
uses: salt-extensions/central-artifacts/.github/workflows/ci.yml@main
21-
with:
22-
release: true
23-
version: ${{ env.VERSION }}
24-
permissions:
25-
contents: write
26-
pull-requests: read
21+
call_central_workflow:
22+
needs: get_tag_version
23+
uses: salt-extensions/central-artifacts/.github/workflows/ci.yml@main
24+
with:
25+
release: true
26+
version: ${{ needs.get_tag_version.outputs.version }}
27+
permissions:
28+
contents: write
29+
id-token: write
30+
pull-requests: read
31+
secrets: inherit

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ lint = [
7070
"saltpylint",
7171
]
7272
tests = [
73-
"pytest>=6.1.0",
74-
"pytest-salt-factories>=1.0.0rc19",
73+
"pytest>=7.2.0",
74+
"pytest-salt-factories>=1.0.0rc28",
7575
]
7676

7777
[project.entry-points."salt.loader"]
File renamed without changes.
File renamed without changes.

tests/pytests/functional/__init__.py

Whitespace-only changes.

tests/pytests/functional/conftest.py

Lines changed: 0 additions & 140 deletions
This file was deleted.

tests/pytests/functional/modules/__init__.py

Whitespace-only changes.

tests/pytests/integration/conftest.py

Lines changed: 0 additions & 108 deletions
This file was deleted.

0 commit comments

Comments
 (0)