Update repo with template version v1.2.3
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
# It is needed to track the repo template version, and editing may break things.
|
# It is needed to track the repo template version, and editing may break things.
|
||||||
# This file will be overwritten by copier on template updates.
|
# This file will be overwritten by copier on template updates.
|
||||||
|
|
||||||
_commit: v1.2.2
|
_commit: v1.2.3
|
||||||
_src_path: https://github.com/bec-project/plugin_copier_template.git
|
_src_path: https://github.com/bec-project/plugin_copier_template.git
|
||||||
make_commit: true
|
make_commit: true
|
||||||
project_name: bec_testing_plugin
|
project_name: bec_testing_plugin
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ on:
|
|||||||
description: "Python version to use"
|
description: "Python version to use"
|
||||||
required: false
|
required: false
|
||||||
type: string
|
type: string
|
||||||
default: "3.11"
|
default: "3.12"
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
pull-requests: write
|
pull-requests: write
|
||||||
@@ -44,7 +44,18 @@ jobs:
|
|||||||
- name: Setup Python
|
- name: Setup Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: "${{ inputs.PYTHON_VERSION || '3.11' }}"
|
python-version: "${{ inputs.PYTHON_VERSION || '3.12' }}"
|
||||||
|
|
||||||
|
- name: Checkout BEC Plugin Repository
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
repository: bec/bec_testing_plugin
|
||||||
|
ref: "${{ inputs.BEC_PLUGIN_REPO_BRANCH || github.head_ref || github.sha }}"
|
||||||
|
path: ./bec_testing_plugin
|
||||||
|
|
||||||
|
- name: Lint for merge conflicts
|
||||||
|
run: |
|
||||||
|
|
||||||
|
|
||||||
- name: Checkout BEC Core
|
- name: Checkout BEC Core
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
@@ -67,13 +78,6 @@ jobs:
|
|||||||
ref: "${{ inputs.BEC_WIDGETS_BRANCH || 'main' }}"
|
ref: "${{ inputs.BEC_WIDGETS_BRANCH || 'main' }}"
|
||||||
path: ./bec_widgets
|
path: ./bec_widgets
|
||||||
|
|
||||||
- name: Checkout BEC Plugin Repository
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
repository: bec/bec_testing_plugin
|
|
||||||
ref: "${{ inputs.BEC_PLUGIN_REPO_BRANCH || github.head_ref || github.sha }}"
|
|
||||||
path: ./bec_testing_plugin
|
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -6,11 +6,16 @@ permissions:
|
|||||||
pull-requests: write
|
pull-requests: write
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
<<<<<<< before updating
|
||||||
create_update_branch_and_pr:
|
create_update_branch_and_pr:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
pull-requests: write
|
pull-requests: write
|
||||||
|
=======
|
||||||
|
test:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
>>>>>>> after updating
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Setup Python
|
- name: Setup Python
|
||||||
@@ -20,13 +25,18 @@ jobs:
|
|||||||
|
|
||||||
- name: Install tools
|
- name: Install tools
|
||||||
run: |
|
run: |
|
||||||
|
<<<<<<< before updating
|
||||||
pip install copier PySide6
|
pip install copier PySide6
|
||||||
|
=======
|
||||||
|
pip install copier
|
||||||
|
>>>>>>> after updating
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Perform update
|
- name: Perform update
|
||||||
run: |
|
run: |
|
||||||
|
<<<<<<< before updating
|
||||||
set -x
|
set -x
|
||||||
git config --global user.email "bec_ci_staging@psi.ch"
|
git config --global user.email "bec_ci_staging@psi.ch"
|
||||||
git config --global user.name "BEC automated CI"
|
git config --global user.name "BEC automated CI"
|
||||||
@@ -61,3 +71,11 @@ jobs:
|
|||||||
\"head\": \"$(echo $branch)\",
|
\"head\": \"$(echo $branch)\",
|
||||||
\"base\": \"main\"
|
\"base\": \"main\"
|
||||||
}"
|
}"
|
||||||
|
=======
|
||||||
|
branch="chore/update-template-$(python -m uuid)"
|
||||||
|
git checkout -b $branch
|
||||||
|
msg = $(copier update --trust --defaults --conflict inline 2>&1 | sed -n 1p)
|
||||||
|
git add -A
|
||||||
|
git diff-index --quiet HEAD || git commit -a -m $msg
|
||||||
|
git push -u origin $branch
|
||||||
|
>>>>>>> after updating
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
include:
|
|
||||||
- file: /templates/plugin-repo-template.yml
|
|
||||||
inputs:
|
|
||||||
name: bec_testing_plugin
|
|
||||||
target: bec_testing_plugin
|
|
||||||
branch: $CHILD_PIPELINE_BRANCH
|
|
||||||
project: bec/awi_utils
|
|
||||||
@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
|
|||||||
name = "bec_testing_plugin"
|
name = "bec_testing_plugin"
|
||||||
version = "0.0.0"
|
version = "0.0.0"
|
||||||
description = "A plugin repository for BEC"
|
description = "A plugin repository for BEC"
|
||||||
requires-python = ">=3.10"
|
requires-python = ">=3.11"
|
||||||
classifiers = [
|
classifiers = [
|
||||||
"Development Status :: 3 - Alpha",
|
"Development Status :: 3 - Alpha",
|
||||||
"Programming Language :: Python :: 3",
|
"Programming Language :: Python :: 3",
|
||||||
|
|||||||
Reference in New Issue
Block a user