Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge releases/v2 into releases/v1 #1314

Merged
merged 41 commits into from Oct 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
e5c3375
Refactor handling of feature flags
aeisenberg Oct 5, 2022
b16314e
Address comments from review
aeisenberg Oct 6, 2022
6de05e4
Rename `FeatureFlag` -> `Feature`
aeisenberg Oct 6, 2022
5915e70
Address comments from review
aeisenberg Oct 6, 2022
b27aed7
Extract GitHubFeatureFlags to a separate class
aeisenberg Oct 6, 2022
3d39294
Mergeback v2.1.27 refs/heads/releases/v2 into main (#1289)
github-actions[bot] Oct 7, 2022
1a17c59
More renaming
aeisenberg Oct 7, 2022
c6c7d29
Clarify merging with merge commit (#1291)
angelapwen Oct 7, 2022
919e4ca
Merge remote-tracking branch 'upstream/main' into aeisenberg/ff-refac…
aeisenberg Oct 7, 2022
6c869f8
Fix typos
aeisenberg Oct 7, 2022
6e1dab2
Fix `withTimeout` helper function
edoardopirovano Oct 11, 2022
362f9a2
Update bundle for 2.11.1
alexet Oct 11, 2022
adb2896
Further update to reflect a conversation with @henrymercer
edoardopirovano Oct 11, 2022
c27c6c7
Merge pull request #1294 from github/alexet/release-codeql-2.11.1-v2
alexet Oct 11, 2022
701cea3
More renaming
aeisenberg Oct 11, 2022
43c3ed9
More feature flag renaming
henrymercer Oct 11, 2022
44edb7c
Merge pull request #1293 from github/edoardo/fix-with-timeout
edoardopirovano Oct 11, 2022
082bdf0
Improve documentation comment
edoardopirovano Oct 11, 2022
cc00a9d
Update supported GitHub Enterprise Server versions.
web-flow Oct 12, 2022
099de40
Merge pull request #1297 from github/update-supported-enterprise-serv…
edoardopirovano Oct 12, 2022
e862e8f
Merge pull request #1296 from github/edoardo/improve-docs
edoardopirovano Oct 12, 2022
34d48f8
Merge remote-tracking branch 'upstream/main' into aeisenberg/ff-refac…
aeisenberg Oct 12, 2022
160e3fe
Merge pull request #1284 from github/aeisenberg/ff-refactoring
aeisenberg Oct 12, 2022
2fafb29
TRAP Caching: Disable on self-hosted runners
edoardopirovano Oct 13, 2022
0c7f674
Merge pull request #1298 from github/edoardo/caching-hosted
edoardopirovano Oct 13, 2022
2c4b2a1
Bump @octokit/types from 7.1.1 to 8.0.0
dependabot[bot] Oct 13, 2022
17ae47e
Update checked-in dependencies
invalid-email-address Oct 13, 2022
e2481f7
Merge pull request #1299 from github/dependabot/npm_and_yarn/octokit/…
aeisenberg Oct 13, 2022
eba983f
Removes deprecated set-output usage
aeisenberg Oct 13, 2022
2ee8edc
Update changelog
aeisenberg Oct 13, 2022
b0f8861
Update CHANGELOG.md
aeisenberg Oct 13, 2022
297ec80
Merge pull request #1301 from github/aeisenberg/remove-set-output
aeisenberg Oct 14, 2022
b709139
Merge branch 'releases/v2' into henrymercer/v2-mergeback
henrymercer Oct 17, 2022
96c8872
Merge pull request #1310 from github/henrymercer/v2-mergeback
henrymercer Oct 18, 2022
aecd032
Update changelog for v2.1.28
invalid-email-address Oct 18, 2022
cc7986c
Merge pull request #1311 from github/update-v2.1.28-96c8872f
edoardopirovano Oct 18, 2022
80d1f26
Revert "Update version and changelog for v1.1.27"
invalid-email-address Oct 18, 2022
b31ec01
Revert "Update checked-in dependencies"
invalid-email-address Oct 18, 2022
4a7a948
Merge remote-tracking branch 'origin/releases/v2' into update-v1.1.28…
invalid-email-address Oct 18, 2022
6e9376a
Update version and changelog for v1.1.28
invalid-email-address Oct 18, 2022
872f837
Update checked-in dependencies
invalid-email-address Oct 18, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/prepare-test/action.yml
Expand Up @@ -22,17 +22,17 @@ runs:
run: |
if [[ ${{ inputs.version }} == "nightly-latest" ]]; then
export LATEST=`gh release list --repo dsp-testing/codeql-cli-nightlies -L 1 | cut -f 3`
echo "::set-output name=tools-url::https://github.com/dsp-testing/codeql-cli-nightlies/releases/download/$LATEST/codeql-bundle.tar.gz"
echo "tools-url=https://github.com/dsp-testing/codeql-cli-nightlies/releases/download/$LATEST/codeql-bundle.tar.gz" >> $GITHUB_OUTPUT
elif [[ ${{ inputs.version }} == *"nightly"* ]]; then
export VERSION=`echo ${{ inputs.version }} | sed -e 's/^.*\-//'`
echo "::set-output name=tools-url::https://github.com/dsp-testing/codeql-cli-nightlies/releases/download/codeql-bundle-$VERSION-manual/codeql-bundle.tar.gz"
echo "tools-url=https://github.com/dsp-testing/codeql-cli-nightlies/releases/download/codeql-bundle-$VERSION-manual/codeql-bundle.tar.gz" >> $GITHUB_OUTPUT
elif [[ ${{ inputs.version }} == *"stable"* ]]; then
export VERSION=`echo ${{ inputs.version }} | sed -e 's/^.*\-//'`
echo "::set-output name=tools-url::https://github.com/github/codeql-action/releases/download/codeql-bundle-$VERSION/codeql-bundle.tar.gz"
echo "tools-url=https://github.com/github/codeql-action/releases/download/codeql-bundle-$VERSION/codeql-bundle.tar.gz" >> $GITHUB_OUTPUT
elif [[ ${{ inputs.version }} == "latest" ]]; then
echo "::set-output name=tools-url::latest"
echo "tools-url=latest" >> $GITHUB_OUTPUT
elif [[ ${{ inputs.version }} == "cached" ]]; then
echo "::set-output name=tools-url::"
echo "tools-url=" >> $GITHUB_OUTPUT
else
echo "::error Unrecognized version specified!"
fi
2 changes: 1 addition & 1 deletion .github/update-release-branch.py
Expand Up @@ -104,7 +104,7 @@ def open_pr(
body.append(' - [ ] Wait for the "Update dependencies" workflow to push a commit updating the dependencies.')
body.append(' - [ ] Mark the PR as ready for review to trigger the full set of PR checks.')

body.append(' - [ ] Approve and merge this PR.')
body.append(' - [ ] Approve and merge this PR. Make sure `Create a merge commit` is selected rather than `Squash and merge` or `Rebase and merge`.')

if is_v2_release:
body.append(' - [ ] Merge the mergeback PR that will automatically be created once this PR is merged.')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Expand Up @@ -61,7 +61,7 @@ jobs:

# Output a JSON-encoded list with the distinct versions to test against.
echo "Suggested matrix config for analysis job: $VERSIONS_JSON"
echo "::set-output name=versions::${VERSIONS_JSON}"
echo "versions=${VERSIONS_JSON}" >> $GITHUB_OUTPUT

build:
needs: [check-codeql-versions]
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/post-release-mergeback.yml
Expand Up @@ -47,11 +47,10 @@ jobs:
id: getVersion
run: |
VERSION="v$(jq '.version' -r 'package.json')"
echo "::set-output name=version::${VERSION}"
echo "version=${VERSION}" >> $GITHUB_OUTPUT
short_sha="${GITHUB_SHA:0:8}"
NEW_BRANCH="mergeback/${VERSION}-to-${BASE_BRANCH}-${short_sha}"
echo "::set-output name=newBranch::${NEW_BRANCH}"

echo "newBranch=${NEW_BRANCH}" >> $GITHUB_OUTPUT

- name: Dump branches
env:
Expand All @@ -77,7 +76,7 @@ jobs:
exists="$?"
if [ "${exists}" -eq 0 ]; then
echo "Tag ${VERSION} exists. Not going to re-release."
echo "::set-output name=exists::true"
echo "exists=true" >> $GITHUB_OUTPUT
else
echo "Tag ${VERSION} does not exist yet."
fi
Expand Down Expand Up @@ -122,7 +121,7 @@ jobs:
- [ ] Remove and re-add the "Update dependencies" label to the PR to trigger just this workflow.
- [ ] Wait for the "Update dependencies" workflow to push a commit updating the dependencies.
- [ ] Mark the PR as ready for review to trigger the full set of PR checks.
- [ ] Approve and merge the PR.
- [ ] Approve and merge the PR. Make sure `Create a merge commit` is selected rather than `Squash and merge` or `Rebase and merge`.
EOF
)

Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,10 @@
# CodeQL Action Changelog

## 1.1.28 - 18 Oct 2022

- Update default CodeQL bundle version to 2.11.1. [#1294](https://github.com/github/codeql-action/pull/1294)
- Replace uses of GitHub Actions command `set-output` because it is now deprecated. See more information in the [GitHub Changelog](https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/). [#1301](https://github.com/github/codeql-action/pull/1301)

## 1.1.27 - 06 Oct 2022

- We are rolling out a feature of the CodeQL Action in October 2022 that changes the way that Go code is analyzed to be more consistent with other compiled languages like C/C++, C#, and Java. You do not need to alter your code scanning workflows. If you encounter any problems, please [file an issue](https://github.com/github/codeql-action/issues) or open a private ticket with GitHub Support and request an escalation to engineering.
Expand Down
14 changes: 7 additions & 7 deletions lib/analyze-action.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.