Skip to content

Commit b59d204

Browse files
authored
Merge branch 'main' into skip-integration-tests-prs-from-forks
2 parents fd36bec + 0a05e95 commit b59d204

45 files changed

Lines changed: 378 additions & 131 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/update-release-branch.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ def get_pr_for_commit(repo, commit):
123123
if prs.totalCount > 0:
124124
# In the case that there are multiple PRs, return the earliest one
125125
prs = list(prs)
126-
sorted(prs, key=lambda pr: int(pr.number))
127-
return prs[0]
126+
sorted_prs = sorted(prs, key=lambda pr: int(pr.number))
127+
return sorted_prs[0]
128128
else:
129129
return None
130130

.github/workflows/integration-testing.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,37 @@ jobs:
9898
env:
9999
TEST_MODE: true
100100

101+
go-custom-tracing:
102+
strategy:
103+
fail-fast: false
104+
matrix:
105+
os: [ubuntu-latest, windows-latest, macos-latest]
106+
runs-on: ${{ matrix.os }}
107+
env:
108+
CODEQL_EXTRACTOR_GO_BUILD_TRACING: "on"
109+
110+
steps:
111+
- uses: actions/setup-go@v2
112+
if: ${{ matrix.os == 'macos-latest' }}
113+
with:
114+
go-version: '^1.13.1'
115+
- uses: actions/checkout@v2
116+
- name: Move codeql-action
117+
shell: bash
118+
run: |
119+
mkdir ../action
120+
mv * .github ../action/
121+
mv ../action/tests/multi-language-repo/{*,.github} .
122+
- uses: ./../action/init
123+
with:
124+
languages: go
125+
- name: Build code
126+
shell: bash
127+
run: go build main.go
128+
- uses: ./../action/analyze
129+
env:
130+
TEST_MODE: true
131+
101132
multi-language-repo_rubocop:
102133
runs-on: ubuntu-latest
103134

lib/actions-util.js

Lines changed: 40 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/actions-util.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)