From 4fbbfbcd327a8fef8d5293b0aa35016830ddbfdd Mon Sep 17 00:00:00 2001 From: chatton Date: Tue, 24 May 2022 09:02:58 +0100 Subject: [PATCH 1/3] chore: Fixing github action workflows (cherry picked from commit ba8c872fa7cc1dad3bb933ac6ce392fa97b59211) # Conflicts: # .github/workflows/codeql-analysis.yml --- .github/workflows/check-docs.yml | 2 +- .github/workflows/codeql-analysis.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-docs.yml b/.github/workflows/check-docs.yml index abcaa066e2d..e5940c495f0 100644 --- a/.github/workflows/check-docs.yml +++ b/.github/workflows/check-docs.yml @@ -3,7 +3,7 @@ name: Check docs build # This will check if the docs build successfully by running `npm run build` on: pull_request: - paths: + paths: - './docs' jobs: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f9a7c4a9230..9f4e244908d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -40,7 +40,11 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 +<<<<<<< HEAD - uses: technote-space/get-diff-action@v6.1.0 +======= + - uses: technote-space/get-diff-action@v6.0.1 +>>>>>>> ba8c872 (chore: Fixing github action workflows) with: PATTERNS: | **/**.go From 72f5f0bd50d757714a4ca8bf44e9fb6a753a492a Mon Sep 17 00:00:00 2001 From: chatton Date: Tue, 24 May 2022 09:29:54 +0100 Subject: [PATCH 2/3] chore: Specifying build command for the CodeQL action (cherry picked from commit 1ebaf3efc1ffe9f33fb3e2492739a407430fd596) # Conflicts: # .github/workflows/codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9f4e244908d..d5aca516d3c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -62,9 +62,8 @@ jobs: # queries: ./path/to/local/query, your-org/your-repo/queries@main queries: crypto-com/cosmos-sdk-codeql@main,security-and-quality if: env.GIT_DIFF - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) +<<<<<<< HEAD - name: Autobuild uses: github/codeql-action/autobuild@v2 if: env.GIT_DIFF @@ -79,6 +78,9 @@ jobs: #- run: | # make bootstrap # make release +======= + - run: make build +>>>>>>> 1ebaf3e (chore: Specifying build command for the CodeQL action) - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 From 9518465cc9356e692e9b70b82060e39d2d6af67b Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Tue, 9 Aug 2022 11:21:02 +0100 Subject: [PATCH 3/3] corrected merge conflicts --- .github/workflows/codeql-analysis.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d5aca516d3c..f9a7c4a9230 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -40,11 +40,7 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 -<<<<<<< HEAD - uses: technote-space/get-diff-action@v6.1.0 -======= - - uses: technote-space/get-diff-action@v6.0.1 ->>>>>>> ba8c872 (chore: Fixing github action workflows) with: PATTERNS: | **/**.go @@ -62,8 +58,9 @@ jobs: # queries: ./path/to/local/query, your-org/your-repo/queries@main queries: crypto-com/cosmos-sdk-codeql@main,security-and-quality if: env.GIT_DIFF + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) -<<<<<<< HEAD - name: Autobuild uses: github/codeql-action/autobuild@v2 if: env.GIT_DIFF @@ -78,9 +75,6 @@ jobs: #- run: | # make bootstrap # make release -======= - - run: make build ->>>>>>> 1ebaf3e (chore: Specifying build command for the CodeQL action) - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2