From c5323fdc2d3f37ebf68dd51807ead9b31f207c4e Mon Sep 17 00:00:00 2001 From: jcdcdev Date: Tue, 24 Sep 2024 00:54:31 +0100 Subject: [PATCH 1/8] +changelog-ignore: dependabot --- .github/dependabot.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index fa0aac7..9f715a1 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,6 +1,8 @@ version: 2 updates: - package-ecosystem: nuget + assignees: + - "${{ github.repository_owner }}" directory: "/" schedule: interval: "daily" @@ -11,6 +13,8 @@ updates: target-branch: "dev" - package-ecosystem: npm + assignees: + - "${{ github.repository_owner }}" directory: "/" schedule: interval: "daily" From 4e49febceb1cab35bcd145b001b20d4905d3b933 Mon Sep 17 00:00:00 2001 From: jcdcdev Date: Tue, 24 Sep 2024 01:01:09 +0100 Subject: [PATCH 2/8] +changelog-ignore: dependabot --- .github/dependabot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9f715a1..1b13467 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -2,7 +2,7 @@ version: 2 updates: - package-ecosystem: nuget assignees: - - "${{ github.repository_owner }}" + - "jcdcdev" directory: "/" schedule: interval: "daily" @@ -14,7 +14,7 @@ updates: - package-ecosystem: npm assignees: - - "${{ github.repository_owner }}" + - "jcdcdev" directory: "/" schedule: interval: "daily" From 7af9d354607df2c0ab81f7671ef0d9e8ef69c70b Mon Sep 17 00:00:00 2001 From: jcdcdev Date: Tue, 24 Sep 2024 18:35:38 +0100 Subject: [PATCH 3/8] +changelog-ignore: rm dependabot & legacy workflow action --- .github/dependabot.yml | 25 ------------------------- .github/workflows/build.yml | 8 ++------ .github/workflows/release.yml | 11 ++++------- 3 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 1b13467..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,25 +0,0 @@ -version: 2 -updates: - - package-ecosystem: nuget - assignees: - - "jcdcdev" - directory: "/" - schedule: - interval: "daily" - time: "04:00" - commit-message: - prefix: "chore" - include: "scope" - target-branch: "dev" - - - package-ecosystem: npm - assignees: - - "jcdcdev" - directory: "/" - schedule: - interval: "daily" - time: "04:00" - commit-message: - prefix: "chore" - include: "scope" - target-branch: "dev" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ac5fe90..4810c8f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,16 +4,12 @@ on: branches: "*" workflow_dispatch: jobs: - metadata: - uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/generate-project-metadata.yml@dev build: runs-on: ubuntu-latest - needs: - - metadata steps: - name: Build uses: jcdcdev/jcdcdev.Umbraco.Github.Build@main with: - project-name: ${{ needs.metadata.outputs.project-name}} - project-path: ${{ needs.metadata.outputs.project-path }} + project-name: jcdcdev.Umbraco.Core + project-path: src/jcdcdev.Umbraco.Core/jcdcdev.Umbraco.Core.csproj umbraco-version: 14 \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 526f7dd..5f1df4a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,22 +3,19 @@ on: workflow_dispatch: pull_request: types: [ closed ] -jobs: - metadata: - uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/generate-project-metadata.yml@dev +jobs: release: + if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest permissions: contents: write - needs: - - metadata steps: - name: Build id: build uses: jcdcdev/jcdcdev.Umbraco.GitHub.Build@main with: - project-name: ${{ needs.metadata.outputs.project-name}} - project-path: ${{ needs.metadata.outputs.project-path }} + project-name: jcdcdev.Umbraco.Core + project-path: src/jcdcdev.Umbraco.Core/jcdcdev.Umbraco.Core.csproj umbraco-version: 14 - name: Release uses: jcdcdev/jcdcdev.Umbraco.GitHub.Release@main From 6f2d85b4b6a0d5e77c0e3aaa9a46507f6ecdbff4 Mon Sep 17 00:00:00 2001 From: jcdcdev Date: Tue, 24 Sep 2024 21:42:18 +0100 Subject: [PATCH 4/8] +changelog-ignore: auto-assign pr & issue --- .github/workflows/auto-assign.yml | 17 +++++++++++++++++ .github/workflows/{pr.yml => create-pr.yml} | 0 2 files changed, 17 insertions(+) create mode 100644 .github/workflows/auto-assign.yml rename .github/workflows/{pr.yml => create-pr.yml} (100%) diff --git a/.github/workflows/auto-assign.yml b/.github/workflows/auto-assign.yml new file mode 100644 index 0000000..76c91d6 --- /dev/null +++ b/.github/workflows/auto-assign.yml @@ -0,0 +1,17 @@ +name: 🤖 Auto Assign +on: + issues: + types: [opened, edited, labeled, unlabeled] + pull_request: + types: [opened, edited, labeled, unlabeled] +jobs: + run: + runs-on: ubuntu-latest + steps: + - uses: wow-actions/auto-assign@v3 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + reviewers: | + ${{ github.repository_owner }} + assignees: | + ${{ github.repository_owner }} \ No newline at end of file diff --git a/.github/workflows/pr.yml b/.github/workflows/create-pr.yml similarity index 100% rename from .github/workflows/pr.yml rename to .github/workflows/create-pr.yml From 813fb90dd8a12aa255a6e2f939822d6b47dc4e02 Mon Sep 17 00:00:00 2001 From: jcdcdev Date: Wed, 25 Sep 2024 00:29:22 +0100 Subject: [PATCH 5/8] +changelog-ignore: update create-pr.yml --- .github/workflows/create-pr.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create-pr.yml b/.github/workflows/create-pr.yml index ea9cbc1..ddc9d8e 100644 --- a/.github/workflows/create-pr.yml +++ b/.github/workflows/create-pr.yml @@ -8,7 +8,7 @@ on: default: false type: boolean schedule: - - cron: '0 0 * * *' + - cron: '0 2 * * *' jobs: get-branches: outputs: @@ -66,10 +66,10 @@ jobs: echo "SOURCE=$SOURCE" >> $GITHUB_ENV echo "TARGET=$TARGET" >> $GITHUB_ENV - name: Run the Action - if: ${{ github.event.inputs.dry-run == 'false' }} + if: ${{ github.event.inputs.dry-run == 'false' }} || ${{ github.event_name == 'schedule' }} uses: devops-infra/action-pull-request@v0.5.5 with: - github_token: ${{ secrets.GITHUB_TOKEN }} + github_token: ${{ secrets.JCDC_BOT_TOKEN}} source_branch: ${{ env.SOURCE }} target_branch: ${{ env.TARGET }} title: "Merge ${{ env.SOURCE }} into ${{ env.TARGET }}" From 8899abfc49e47318973e57cad1c195e10abb6aac Mon Sep 17 00:00:00 2001 From: jcdcdev Date: Wed, 25 Sep 2024 01:15:06 +0100 Subject: [PATCH 6/8] +changelog-ignore: update build.yml --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4810c8f..e7f1363 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,6 @@ name: 🏗️ Build on: pull_request: - branches: "*" workflow_dispatch: jobs: build: From b26d29d8c6d00a4443eff743e5c7e003c7576fb6 Mon Sep 17 00:00:00 2001 From: jcdcdev Date: Thu, 26 Sep 2024 19:06:07 +0100 Subject: [PATCH 7/8] +changelog-ignore: update create-pr.yml --- .github/workflows/create-pr.yml | 34 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/.github/workflows/create-pr.yml b/.github/workflows/create-pr.yml index ddc9d8e..431bd68 100644 --- a/.github/workflows/create-pr.yml +++ b/.github/workflows/create-pr.yml @@ -1,9 +1,9 @@ -name: 🔃 Create PRs +name: 📤 Create PRs on: workflow_dispatch: inputs: dry-run: - description: 'Run the workflow without creating PRs' + description: "Dry run: Run the workflow without creating a Pull Request" required: false default: false type: boolean @@ -36,12 +36,10 @@ jobs: matrix: branch: ${{fromJson(needs.get-branches.outputs.branches)}} runs-on: ubuntu-latest + env: + DRY_RUN: ${{ contains(github.event.inputs.dry-run, 'true') }} steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Set Env + - name: Set Variables run: | TARGET=$(echo ${{ matrix.branch }} | sed 's/dev\///') SOURCE=${{ matrix.branch }} @@ -56,22 +54,16 @@ jobs: exit 1 fi - if [ "$SOURCE" == "$TARGET" ]; then - echo "SOURCE is the same as TARGET" - exit 1 - fi - echo "SOURCE=$SOURCE" echo "TARGET=$TARGET" + echo "SOURCE=$SOURCE" >> $GITHUB_ENV echo "TARGET=$TARGET" >> $GITHUB_ENV - - name: Run the Action - if: ${{ github.event.inputs.dry-run == 'false' }} || ${{ github.event_name == 'schedule' }} - uses: devops-infra/action-pull-request@v0.5.5 + - name: Create Pull Request + id: create-pull-request + uses: jcdcdev/jcdcdev.GitHub.CreatePullRequest@main with: - github_token: ${{ secrets.JCDC_BOT_TOKEN}} - source_branch: ${{ env.SOURCE }} - target_branch: ${{ env.TARGET }} - title: "Merge ${{ env.SOURCE }} into ${{ env.TARGET }}" - reviewer: ${{ github.repository_owner }} - assignee: ${{ github.repository_owner }} + source-branch: ${{ env.SOURCE }} + target-branch: ${{ env.TARGET }} + dry-run: ${{ env.DRY_RUN }} + github-token: ${{ secrets.JCDC_BOT_TOKEN }} From 954a26238fd6a0cd08522bea5a5bf1d5799a8a29 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sun, 29 Sep 2024 20:35:35 +0000 Subject: [PATCH 8/8] fix: src/TestSite.14/TestSite.14.csproj to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-DOTNET-SIXLABORSIMAGESHARP-7547406 - https://snyk.io/vuln/SNYK-DOTNET-AZUREIDENTITY-7246762 - https://snyk.io/vuln/SNYK-DOTNET-UMBRACOCMSAPIMANAGEMENT-7723921 - https://snyk.io/vuln/SNYK-DOTNET-SIXLABORSIMAGESHARP-7547407 - https://snyk.io/vuln/SNYK-DOTNET-UMBRACOCMSWEBCOMMON-7723923 - https://snyk.io/vuln/SNYK-DOTNET-UMBRACOCMSAPIMANAGEMENT-7723922 --- src/TestSite.14/TestSite.14.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TestSite.14/TestSite.14.csproj b/src/TestSite.14/TestSite.14.csproj index caeaa36..282f3e2 100644 --- a/src/TestSite.14/TestSite.14.csproj +++ b/src/TestSite.14/TestSite.14.csproj @@ -7,7 +7,7 @@ - +