From 1f2aef988a0f27e75181d41317d6b8894e9a6b15 Mon Sep 17 00:00:00 2001 From: Mikkel Jakobsen Date: Tue, 21 May 2024 19:45:58 +0200 Subject: [PATCH 1/2] Testing... --- .github/workflows/create-pr.yml | 6 ++++++ .github/workflows/test.yml | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/create-pr.yml b/.github/workflows/create-pr.yml index 869089c75..251e855f2 100644 --- a/.github/workflows/create-pr.yml +++ b/.github/workflows/create-pr.yml @@ -33,6 +33,12 @@ jobs: fetch-depth: 0 if: ${{ env.PR_BRANCH && env.BUILD_URL }} + - name: Skip if branch exists already + run: | + set -e + git fetch origin ${{ env.PR_BRANCH }} || echo "Branch ${{ env.PR_BRANCH }} does not exist yet." + if: ${{ env.PR_BRANCH && env.BUILD_URL }} + - name: Insert dependency uses: Wandalen/wretry.action@master id: manipulate_composer diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 62ed57789..0a6d3c2f1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,12 +11,14 @@ jobs: name: Test runs-on: ubuntu-latest steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Testing run: | - BRANCH_EXISTS=$(git fetch origin develop || echo "John") - echo "$BRANCH_EXISTS" - # echo "BUILD_URL_IS_ACCEPTED=$BUILD_URL_IS_ACCEPTED" >> $GITHUB_ENV + echo "BRANCH_EXISTS=$(git show-ref --quiet refs/heads/abe && echo 'true' || echo 'false')" >> $GITHUB_ENV + - name: Testing II run: | - echo "Hello" + echo "${{ toJson(env) }}" From 34a0236c2310b935e8fdd6e96685d7ab2f5409ac Mon Sep 17 00:00:00 2001 From: mikkel Date: Tue, 21 May 2024 18:25:09 +0000 Subject: [PATCH 2/2] Insert new reference to dependency danskernesdigitalebibliotek/dpl-react: https://github.com/reload/poc-dpl-react-pr-trigger/releases/download/branch-wild-cerebroid-atlanticspadefish/dist-wild-cerebroid-atlanticspadefish.zip --- composer.json | 6 +++--- composer.lock | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 2255af3ea..8ffec064c 100644 --- a/composer.json +++ b/composer.json @@ -40,10 +40,10 @@ "type": "package", "package": { "name": "danskernesdigitalebibliotek/dpl-react", - "version": "2024.20.1", + "version": "dev-master", "type": "drupal-library", "dist": { - "url": "https://github.com/danskernesdigitalebibliotek/dpl-react/releases/download/2024.20.1/dist-2024-20-1-4291024f5b2d30ec59a5a51497c5f776dd1fda7e.zip", + "url": "https://github.com/reload/poc-dpl-react-pr-trigger/releases/download/branch-wild-cerebroid-atlanticspadefish/dist-wild-cerebroid-atlanticspadefish.zip", "type": "zip" }, "require": { @@ -89,7 +89,7 @@ "cweagans/composer-patches": "1.7.3", "danskernesdigitalebibliotek/cms-api": "*", "danskernesdigitalebibliotek/dpl-design-system": "2024.20.1", - "danskernesdigitalebibliotek/dpl-react": "2024.20.1", + "danskernesdigitalebibliotek/dpl-react": "dev-master", "danskernesdigitalebibliotek/fbs-client": "*", "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1", "deoliveiralucas/array-keys-case-transform": "^1.1", diff --git a/composer.lock b/composer.lock index 459a0476b..137128d4a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ac6f0f0f7a95237c8621dfd0fab4cfae", + "content-hash": "2580ec7afa43b71da9796ad20dddf89d", "packages": [ { "name": "amazeeio/drupal_integrations", @@ -1158,10 +1158,10 @@ }, { "name": "danskernesdigitalebibliotek/dpl-react", - "version": "2024.20.1", + "version": "dev-master", "dist": { "type": "zip", - "url": "https://github.com/danskernesdigitalebibliotek/dpl-react/releases/download/2024.20.1/dist-2024-20-1-4291024f5b2d30ec59a5a51497c5f776dd1fda7e.zip" + "url": "https://github.com/reload/poc-dpl-react-pr-trigger/releases/download/branch-wild-cerebroid-atlanticspadefish/dist-wild-cerebroid-atlanticspadefish.zip" }, "require": { "composer/installers": "^1.2.0"