From 7b0f5d2122d778291e642a9027b551be374f0db7 Mon Sep 17 00:00:00 2001 From: Elena Shostak Date: Mon, 30 Dec 2024 12:24:55 +0100 Subject: [PATCH 1/4] Added codeql env var to skip types for 8.x branch --- .github/workflows/codeql.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 291f869c82bf8..47b6415963d00 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -45,6 +45,11 @@ jobs: run: | echo "CHECKOUT_REF=$(git symbolic-ref HEAD)" >> "$GITHUB_ENV" echo "CHECKOUT_SHA=$(git rev-parse HEAD)" >> "$GITHUB_ENV" + echo "CHECKOUT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD) >> "$GITHUB_ENV" + + - name: Set experimental environment variable for 8.x branch + if: env.CHECKOUT_BRANCH_NAME == '8.x' + run: echo "CODEQL_EXTRACTOR_JAVASCRIPT_OPTION_SKIP_TYPES=true" >> "$GITHUB_ENV" - name: Set experimental environment variable for 8.x branch if: env.CHECKOUT_REF == 'refs/heads/8.x' From 8340f2d1b5475d3cd8358a0581501f303a95e434 Mon Sep 17 00:00:00 2001 From: Elena Shostak Date: Mon, 30 Dec 2024 12:33:09 +0100 Subject: [PATCH 2/4] Fix --- .github/workflows/codeql.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 47b6415963d00..2793061ba5dc9 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -45,10 +45,9 @@ jobs: run: | echo "CHECKOUT_REF=$(git symbolic-ref HEAD)" >> "$GITHUB_ENV" echo "CHECKOUT_SHA=$(git rev-parse HEAD)" >> "$GITHUB_ENV" - echo "CHECKOUT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD) >> "$GITHUB_ENV" - name: Set experimental environment variable for 8.x branch - if: env.CHECKOUT_BRANCH_NAME == '8.x' + if: env.CHECKOUT_REF == 'refs/heads/8.x' run: echo "CODEQL_EXTRACTOR_JAVASCRIPT_OPTION_SKIP_TYPES=true" >> "$GITHUB_ENV" - name: Set experimental environment variable for 8.x branch From ca686a3db4eac641a9c70b93cc5f51923246541c Mon Sep 17 00:00:00 2001 From: Elena Shostak Date: Mon, 30 Dec 2024 14:08:19 +0100 Subject: [PATCH 3/4] Syntax fix --- .github/workflows/codeql.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 2793061ba5dc9..155f1277cc621 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -51,8 +51,8 @@ jobs: run: echo "CODEQL_EXTRACTOR_JAVASCRIPT_OPTION_SKIP_TYPES=true" >> "$GITHUB_ENV" - name: Set experimental environment variable for 8.x branch - if: env.CHECKOUT_REF == 'refs/heads/8.x' - run: echo "CODEQL_EXTRACTOR_JAVASCRIPT_OPTION_SKIP_TYPES=true" >> "$GITHUB_ENV" + if: env.CHECKOUT_REF == 'refs/heads/8.x' + run: echo "CODEQL_EXTRACTOR_JAVASCRIPT_OPTION_SKIP_TYPES=true" >> "$GITHUB_ENV" - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@883d8588e56d1753a8a58c1c86e88976f0c23449 # v3.26.3 From 5a8f84f5156fd67819eef5538f76ff29a6135ece Mon Sep 17 00:00:00 2001 From: Elena Shostak Date: Mon, 30 Dec 2024 14:12:32 +0100 Subject: [PATCH 4/4] Syntax fix --- .github/workflows/codeql.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 155f1277cc621..ea18312df3cc8 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -46,10 +46,6 @@ jobs: echo "CHECKOUT_REF=$(git symbolic-ref HEAD)" >> "$GITHUB_ENV" echo "CHECKOUT_SHA=$(git rev-parse HEAD)" >> "$GITHUB_ENV" - - name: Set experimental environment variable for 8.x branch - if: env.CHECKOUT_REF == 'refs/heads/8.x' - run: echo "CODEQL_EXTRACTOR_JAVASCRIPT_OPTION_SKIP_TYPES=true" >> "$GITHUB_ENV" - - name: Set experimental environment variable for 8.x branch if: env.CHECKOUT_REF == 'refs/heads/8.x' run: echo "CODEQL_EXTRACTOR_JAVASCRIPT_OPTION_SKIP_TYPES=true" >> "$GITHUB_ENV"