Skip to content

Commit

Permalink
Merge pull request #5 from nicholasmhughes/copier-profile
Browse files Browse the repository at this point in the history
Copier profile
  • Loading branch information
nicholasmhughes authored Jan 14, 2024
2 parents bde0426 + c8db7c6 commit 87e221f
Show file tree
Hide file tree
Showing 16 changed files with 65 additions and 381 deletions.
3 changes: 2 additions & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Autogenerated. Do not edit this by hand, use `copier update`.
---
_commit: 0.2.6
_commit: 0.2.7
_src_path: https://github.com/lkubb/salt-extension-copier
author: EITR Technologies, LLC
author_email: [email protected]
Expand All @@ -20,3 +20,4 @@ ssh_fixtures: false
summary: Salt Extension for interacting with Freezer
tracker_url: https://github.com/salt-extensions/saltext-freezer/issues
url: https://github.com/salt-extensions/saltext-freezer
workflows: org
10 changes: 8 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
name: Pull Request or Push

on: [push, pull_request]
on:
push:
branches:
- 'main' # Run on pushes to main
tags-ignore:
- '*' # Ignore pushes to tags
pull_request:

jobs:
ci:
call_central_workflow:
name: CI
uses: salt-extensions/central-artifacts/.github/workflows/ci.yml@main
permissions:
Expand Down
27 changes: 16 additions & 11 deletions .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,29 @@ name: Tagged Releases
on:
push:
tags:
- "v*"
- "v*" # Only tags starting with "v" for "v1.0.0", etc.

jobs:
ci:
get_tag_version:
runs-on: ubuntu-latest
outputs:
version: ${{ steps.get_version.outputs.version }}
steps:
- name: Checkout code
uses: actions/checkout@v4

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

- name: CI
uses: salt-extensions/central-artifacts/.github/workflows/ci.yml@main
with:
release: true
version: ${{ env.VERSION }}
permissions:
contents: write
pull-requests: read
call_central_workflow:
needs: get_tag_version
uses: salt-extensions/central-artifacts/.github/workflows/ci.yml@main
with:
release: true
version: ${{ needs.get_tag_version.outputs.version }}
permissions:
contents: write
id-token: write
pull-requests: read
secrets: inherit
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ lint = [
"saltpylint",
]
tests = [
"pytest>=6.1.0",
"pytest-salt-factories>=1.0.0rc19",
"pytest>=7.2.0",
"pytest-salt-factories>=1.0.0rc28",
]

[project.entry-points."salt.loader"]
Expand Down
File renamed without changes.
File renamed without changes.
Empty file.
140 changes: 0 additions & 140 deletions tests/pytests/functional/conftest.py

This file was deleted.

Empty file.
108 changes: 0 additions & 108 deletions tests/pytests/integration/conftest.py

This file was deleted.

Empty file removed tests/pytests/unit/__init__.py
Empty file.
Loading

0 comments on commit 87e221f

Please sign in to comment.