From 1228eeda692bf1c63107ceda17a7da6847fbd575 Mon Sep 17 00:00:00 2001 From: jcdcdev Date: Thu, 6 Jun 2024 21:46:40 +0100 Subject: [PATCH 1/4] fix: dashboard does not display --- .github/workflows/build.yml | 2 ++ .github/workflows/release.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5803a96..74c4c5f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,4 +16,6 @@ jobs: with: project-name: ${{ needs.metadata.outputs.project-name}} project-path: ${{ needs.metadata.outputs.project-path }} + npm-working-dir: ${{ needs.metadata.outputs.npm-working-dir }} + npm-enabled: true umbraco-version: 14 \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 93c53c7..3bfe4dc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,6 +19,8 @@ jobs: with: project-name: ${{ needs.metadata.outputs.project-name}} project-path: ${{ needs.metadata.outputs.project-path }} + npm-working-dir: ${{ needs.metadata.outputs.npm-working-dir }} + npm-enabled: true umbraco-version: 14 - name: Release uses: jcdcdev/jcdcdev.Umbraco.GitHub.Release@main From 1a8750d3ed7673c1538b1c0ca5d3a7f709b9cb99 Mon Sep 17 00:00:00 2001 From: jcdcdev Date: Thu, 6 Jun 2024 22:10:28 +0100 Subject: [PATCH 2/4] +changelog-ignore: ci: merge v14 in dev/14 on release --- .github/workflows/release.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3bfe4dc..e55ec0d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,4 +28,10 @@ jobs: artifact-name: ${{ steps.build.outputs.artifact-name }} version: ${{ steps.build.outputs.version }} nuget-api-key: ${{ secrets.NUGET_API_KEY }} - github-token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + github-token: ${{ secrets.GITHUB_TOKEN }} + - name: Merge latest v14 into dev/v14 + run: | + git checkout dev/v14 + git pull origin dev/v14 + git merge origin/v14 + git push origin dev/v14 \ No newline at end of file From 98f5babdf56c134d65e17dcd6e03302e64adb807 Mon Sep 17 00:00:00 2001 From: jcdcdev Date: Thu, 6 Jun 2024 22:38:52 +0100 Subject: [PATCH 3/4] +changelog-ignore: ci: merge v14 in dev/14 on release --- .github/workflows/release.yml | 8 +---- .github/workflows/sync-branches.yml | 53 +++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/sync-branches.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e55ec0d..3bfe4dc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,10 +28,4 @@ jobs: artifact-name: ${{ steps.build.outputs.artifact-name }} version: ${{ steps.build.outputs.version }} nuget-api-key: ${{ secrets.NUGET_API_KEY }} - github-token: ${{ secrets.GITHUB_TOKEN }} - - name: Merge latest v14 into dev/v14 - run: | - git checkout dev/v14 - git pull origin dev/v14 - git merge origin/v14 - git push origin dev/v14 \ No newline at end of file + github-token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml new file mode 100644 index 0000000..7505098 --- /dev/null +++ b/.github/workflows/sync-branches.yml @@ -0,0 +1,53 @@ +name: 🔃 Sync branches + +on: + push: + branches: + - 'v*' + workflow_dispatch: + +jobs: + check-branch: + runs-on: ubuntu-latest + outputs: + is-valid-branch: ${{ steps.branch_check.outputs.is-valid-branch }} + steps: + - name: Check if branch name starts with 'v' + id: branch_check + run: | + BRANCH_NAME=${{ github.ref }} + if [[ $BRANCH_NAME == refs/heads/v* ]]; then + echo "::set-output name=is-valid-branch::true" + else + echo "::set-output name=is-valid-branch::false" + exit 1 + fi + + merge-branches: + needs: check-branch + if: needs.check-branch.outputs.is-valid-branch == 'true' + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Merge into dev/v** + run: | + # Extract the version number from the branch name + VERSION=$(echo "${GITHUB_REF}" | sed -n 's#refs/heads/v\([0-9]\+\)#\1#p') + echo "Merging into dev/v$VERSION" + + # Pull latest of v** + git checkout v${VERSION} + git pull origin v${VERSION} + echo "Pulled latest for v$VERSION" + + # Merge into dev/v** + git checkout dev/v${VERSION} + git merge v${VERSION} --no-ff -m "Merging v$VERSION into dev/v$VERSION" + echo "Merged v$VERSION into dev/v$VERSION" + + # Push changes + git push origin dev/v${VERSION} + echo "Pushed changes to dev/v$VERSION" + From 0a7b793c965085a5e36acf7ede432d7c711f3ecf Mon Sep 17 00:00:00 2001 From: jcdcdev Date: Thu, 6 Jun 2024 23:06:16 +0100 Subject: [PATCH 4/4] +changelog-ignore: ci: --- .github/workflows/sync-branches.yml | 53 ----------------------------- 1 file changed, 53 deletions(-) delete mode 100644 .github/workflows/sync-branches.yml diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml deleted file mode 100644 index 7505098..0000000 --- a/.github/workflows/sync-branches.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: 🔃 Sync branches - -on: - push: - branches: - - 'v*' - workflow_dispatch: - -jobs: - check-branch: - runs-on: ubuntu-latest - outputs: - is-valid-branch: ${{ steps.branch_check.outputs.is-valid-branch }} - steps: - - name: Check if branch name starts with 'v' - id: branch_check - run: | - BRANCH_NAME=${{ github.ref }} - if [[ $BRANCH_NAME == refs/heads/v* ]]; then - echo "::set-output name=is-valid-branch::true" - else - echo "::set-output name=is-valid-branch::false" - exit 1 - fi - - merge-branches: - needs: check-branch - if: needs.check-branch.outputs.is-valid-branch == 'true' - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Merge into dev/v** - run: | - # Extract the version number from the branch name - VERSION=$(echo "${GITHUB_REF}" | sed -n 's#refs/heads/v\([0-9]\+\)#\1#p') - echo "Merging into dev/v$VERSION" - - # Pull latest of v** - git checkout v${VERSION} - git pull origin v${VERSION} - echo "Pulled latest for v$VERSION" - - # Merge into dev/v** - git checkout dev/v${VERSION} - git merge v${VERSION} --no-ff -m "Merging v$VERSION into dev/v$VERSION" - echo "Merged v$VERSION into dev/v$VERSION" - - # Push changes - git push origin dev/v${VERSION} - echo "Pushed changes to dev/v$VERSION" -