From eb7d55d7dce63957d82383387759ddd91500d5b5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 22:39:05 +0100 Subject: [PATCH 1/5] chore(main): release 2.0.1 (#509) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ca13ae5..94f29dc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.0.1](https://github.com/AndreasAugustin/actions-template-sync/compare/v2.0.0...v2.0.1) (2024-03-18) + + +### Bug Fixes + +* **#507:** :bug: pr title and body internal variable substitution ([#508](https://github.com/AndreasAugustin/actions-template-sync/issues/508)) ([912b4e0](https://github.com/AndreasAugustin/actions-template-sync/commit/912b4e01a39729b00a1f928303f864294d6cbede)) + ## [2.0.0](https://github.com/AndreasAugustin/actions-template-sync/compare/v1.12.0...v2.0.0) (2024-03-13) From 1b54b0f245bd75aeef6b1d3a17810b715135a31a Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 23:26:13 +0100 Subject: [PATCH 2/5] docs: add JessicaS11 as a contributor for bug (#511) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index cca2cfdc..b886937e 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -270,6 +270,15 @@ "ideas", "code" ] + }, + { + "login": "JessicaS11", + "name": "Jessica Scheick", + "avatar_url": "https://avatars.githubusercontent.com/u/11756442?v=4", + "profile": "https://github.com/JessicaS11", + "contributions": [ + "bug" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 595f5ad7..1b8c0575 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # actions-template-sync -[![All Contributors](https://img.shields.io/badge/all_contributors-26-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-27-orange.svg?style=flat-square)](#contributors-) [![actions-template-sync](https://github.com/AndreasAugustin/actions-template-sync/actions/workflows/actions_template_sync.yml/badge.svg)](https://github.com/AndreasAugustin/actions-template-sync/actions/workflows/actions_template_sync.yml) @@ -625,6 +625,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d Kevin AUDE
Kevin AUDE
🤔 💻 Jakob
Jakob
👀 Kevin Deldycke
Kevin Deldycke
🐛 🤔 💻 + Jessica Scheick
Jessica Scheick
🐛 From 814f4564aa1ce6d354dcf48a34ea5b7a670327a5 Mon Sep 17 00:00:00 2001 From: andy Augustin Date: Thu, 28 Mar 2024 22:01:18 +0100 Subject: [PATCH 3/5] fix(#510): :bug: issue with blank lines within .templatesyncignore (#512) * fix: :bug: Signed-off-by: Andy Augustin * fix(#510): :bug: .templatesyncignore issue with pathspec git reset Signed-off-by: Andy Augustin * docs: :memo: update some features Signed-off-by: Andy Augustin --------- Signed-off-by: Andy Augustin --- README.md | 16 +++++++++++++--- src/sync_template.sh | 4 ++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1b8c0575..0d615718 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,13 @@ Because of the nice community, several feature requests helped to go on with the ## Features +This action is creating a pull request with the latest changes within the target repo whenever it runs with following exceptions + +* there is already an open PR created with the latest changes of the source repository. + * if there are new changes and a PR is already open, a new PR will be created (option to clean up older PRs) +* related new changes are ignored within the `.templatesyncignore` file +* the source repository is fully included within the target repository + ```mermaid flowchart LR github_source("fa:fa-github GitHub source repository [private|public]") @@ -89,7 +96,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 # https://github.com/actions/checkout#usage - # uncomment if you use submodules within the source repository + # uncomment if you use submodules within the repository # with: # submodules: true @@ -119,14 +126,16 @@ jobs: runs-on: ubuntu-latest steps: - - name: Generate token to read from source repo # see: https://github.com/tibdex/github-app-token + - name: Generate token to read from source repo # see: https://github.com/tibdex/github-app-token id: generate_token - uses: tibdex/github-app-token@v1 + # https://github.com/tibdex/github-app-token + uses: tibdex/github-app-token@v2 with: app_id: ${{ secrets.APP_ID }} private_key: ${{ secrets.PRIVATE_KEY }} - name: Checkout + # https://github.com/actions/checkout#usage uses: actions/checkout@v4 with: # submodules: true @@ -163,6 +172,7 @@ jobs: steps: # To use this repository's private action, you must check out the repository - name: Checkout + # https://github.com/actions/checkout#usage uses: actions/checkout@v4 with: # submodules: true diff --git a/src/sync_template.sh b/src/sync_template.sh index df0dfda3..b24015e8 100755 --- a/src/sync_template.sh +++ b/src/sync_template.sh @@ -357,8 +357,8 @@ function handle_templatesyncignore() { # we are checking the ignore file if it exists or is empty # -s is true if the file contains whitespaces if [ -s "${template_sync_ignore_file_path}" ]; then - debug "unstage files from template sync ignore" - git reset --pathspec-from-file="${template_sync_ignore_file_path}" + debug "unstage files from template sync ignore ${template_sync_ignore_file_path}" + < "${template_sync_ignore_file_path}" awk NF | xargs -r git reset -- debug "clean untracked files" git clean -df From f4a0a81b046834f23edc491562f8e50ce9199dfb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 22:03:16 +0100 Subject: [PATCH 4/5] chore(main): release 2.0.2 (#513) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94f29dc8..9efd809d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.0.2](https://github.com/AndreasAugustin/actions-template-sync/compare/v2.0.1...v2.0.2) (2024-03-28) + + +### Bug Fixes + +* **#510:** :bug: issue with blank lines within .templatesyncignore ([#512](https://github.com/AndreasAugustin/actions-template-sync/issues/512)) ([814f456](https://github.com/AndreasAugustin/actions-template-sync/commit/814f4564aa1ce6d354dcf48a34ea5b7a670327a5)) + ## [2.0.1](https://github.com/AndreasAugustin/actions-template-sync/compare/v2.0.0...v2.0.1) (2024-03-18) From 1abdff6b33e0200c2ac6ddf19f75bebdb3dde008 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 12:09:57 +0200 Subject: [PATCH 5/5] Chore(deps): Bump node from 21.7.1-alpine to 21.7.2-alpine (#515) Bumps node from 21.7.1-alpine to 21.7.2-alpine. --- updated-dependencies: - dependency-name: node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bb462723..03008ad1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,7 +54,7 @@ ENTRYPOINT ["/bin/zsh"] ####################################### # image for creating the documentation ###################################### -FROM node:21.7.1-alpine as docs +FROM node:21.7.2-alpine as docs # install packages RUN apk add --update --no-cache bash make git zsh curl tmux