Skip to content

Commit 14ebbb5

Browse files
lcarteylcartey
authored
Merge branch 'main' into patch-1
2 parents 1054d7e + c914cdb commit 14ebbb5

File tree

17 files changed

+21
-34
lines changed

17 files changed

+21
-34
lines changed

‎c/cert/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name: cert-c-coding-standards
2-
version: 2.6.0-dev
2+
version: 2.7.0-dev
33
suites: codeql-suites
44
libraryPathDependencies: common-c-coding-standards

‎c/cert/test/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name: cert-c-coding-standards-tests
2-
version: 2.6.0-dev
2+
version: 2.7.0-dev
33
libraryPathDependencies: cert-c-coding-standards
44
extractor: cpp

‎c/common/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
name: common-c-coding-standards
2-
version: 2.6.0-dev
2+
version: 2.7.0-dev
33
libraryPathDependencies: common-cpp-coding-standards

‎c/common/test/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name: common-c-coding-standards-tests
2-
version: 2.6.0-dev
2+
version: 2.7.0-dev
33
libraryPathDependencies: common-c-coding-standards
44
extractor: cpp

‎c/misra/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name: misra-c-coding-standards
2-
version: 2.6.0-dev
2+
version: 2.7.0-dev
33
suites: codeql-suites
44
libraryPathDependencies: common-c-coding-standards

‎c/misra/test/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name: misra-c-coding-standards-tests
2-
version: 2.6.0-dev
2+
version: 2.7.0-dev
33
libraryPathDependencies: misra-c-coding-standards
44
extractor: cpp

‎cpp/autosar/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name: autosar-cpp-coding-standards
2-
version: 2.6.0-dev
2+
version: 2.7.0-dev
33
suites: codeql-suites
44
libraryPathDependencies: common-cpp-coding-standards

‎cpp/autosar/test/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name: autosar-cpp-coding-standards-tests
2-
version: 2.6.0-dev
2+
version: 2.7.0-dev
33
libraryPathDependencies: autosar-cpp-coding-standards
44
extractor: cpp

‎cpp/cert/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name: cert-cpp-coding-standards
2-
version: 2.6.0-dev
2+
version: 2.7.0-dev
33
suites: codeql-suites
44
libraryPathDependencies: common-cpp-coding-standards

‎cpp/cert/test/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name: cert-cpp-coding-standards-tests
2-
version: 2.6.0-dev
2+
version: 2.7.0-dev
33
libraryPathDependencies: cert-cpp-coding-standards
44
extractor: cpp

‎cpp/common/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
name: common-cpp-coding-standards
2-
version: 2.6.0-dev
2+
version: 2.7.0-dev
33
libraryPathDependencies: codeql-cpp

‎cpp/common/test/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name: common-cpp-coding-standards-tests
2-
version: 2.6.0-dev
2+
version: 2.7.0-dev
33
libraryPathDependencies: common-cpp-coding-standards
44
extractor: cpp

‎cpp/misra/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
name: misra-cpp-coding-standards
2-
version: 2.6.0-dev
2+
version: 2.7.0-dev
33
libraryPathDependencies: common-cpp-coding-standards

‎cpp/misra/test/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name: misra-cpp-coding-standards-tests
2-
version: 2.6.0-dev
2+
version: 2.7.0-dev
33
libraryPathDependencies: misra-cpp-coding-standards
44
extractor: cpp

‎cpp/report/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
name: report-cpp-coding-standards
2-
version: 2.6.0-dev
2+
version: 2.7.0-dev
33
libraryPathDependencies: codeql-cpp

‎docs/development_handbook.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
| 0.22.0 | 2022-07-05 | Remco Vermeulen | Update section `Generation of query templates from rule specifications` to include external help files. |
3131
| 0.23.0 | 2022-07-05 | Remco Vermeulen | Update text to consider both the C++ and the C standards. |
3232
| 0.24.0 | 2022-07-05 | Remco Vermeulen | Update release process to include steps for external help files. |
33+
| 0.25.0 | 2022-07-22 | Jeroen Ketema | Document the existence and purpose of the `next` branch. |
3334

3435
## Scope of work
3536

@@ -605,6 +606,10 @@ All software development processes associated with this repository should be doc
605606

606607
Requirements and project planning are maintained separately within an internal repository at GitHub.
607608

609+
### Purpose ot the `next` branch
610+
611+
This git repository also has a [`next` branch](https://github.com/github/codeql-coding-standards/tree/next). The purpose of this branch is to track changes that that will become necessary when upgrading the CodeQL external dependencies as described in section _Upgrading external dependencies_. The changes on the `next` branch will undergo only light reviewing. As such, a full review as described in section _Code review and automated checks_ is required when merging these changes into `main`; no releases should be made from the `next` branch. We aim to ensure that the changes on the `next` branch are as complete as possible so that merging into `main` will be straightforward.
612+
608613
## Task Automation
609614

610615
In the `.vscode` directory this repository comes with a `tasks.json` file which automates some of the tasks described in this document. To access them, in VSCode use `Ctrl+Shift+P` and select `Run Task`.

‎scripts/release/create_draft_release.sh

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,36 +34,18 @@ TEMP_DIR="$(mktemp -d)"
3434

3535
echo "Identified code-scanning-pack-gen.yml run id: $CODE_SCANNING_PACK_GEN_RUN_ID"
3636

37-
echo "Fetching anonymized Code Scanning pack"
38-
CODE_SCANNING_ANON_ARTIFACT_NAME="code-scanning-cpp-query-pack-anon.zip"
39-
CODE_SCANNING_ANON_VERSIONED_ARTIFACT_NAME="code-scanning-cpp-query-pack-anon-$VERSION.zip"
40-
gh run download $CODE_SCANNING_PACK_GEN_RUN_ID -n "$CODE_SCANNING_ANON_ARTIFACT_NAME"
41-
mv "$CODE_SCANNING_ANON_ARTIFACT_NAME" "$TEMP_DIR/$CODE_SCANNING_ANON_VERSIONED_ARTIFACT_NAME"
42-
4337
echo "Fetching Code Scanning pack"
4438
CODE_SCANNING_ARTIFACT_NAME="code-scanning-cpp-query-pack.zip"
4539
CODE_SCANNING_VERSIONED_ARTIFACT_NAME="code-scanning-cpp-query-pack-$VERSION.zip"
4640
gh run download $CODE_SCANNING_PACK_GEN_RUN_ID -n "$CODE_SCANNING_ARTIFACT_NAME"
4741
mv "$CODE_SCANNING_ARTIFACT_NAME" "$TEMP_DIR/$CODE_SCANNING_VERSIONED_ARTIFACT_NAME"
4842

49-
echo "Fetching anonymized LGTM pack"
50-
LGTM_ANON_ARTIFACT_NAME="lgtm-cpp-query-pack-anon.zip"
51-
LGTM_ANON_VERSIONED_ARTIFACT_NAME="lgtm-cpp-query-pack-anon-v$VERSION.zip"
52-
gh run download $CODE_SCANNING_PACK_GEN_RUN_ID -n "$LGTM_ANON_ARTIFACT_NAME"
53-
mv "$LGTM_ANON_ARTIFACT_NAME" "$TEMP_DIR/$LGTM_ANON_VERSIONED_ARTIFACT_NAME"
54-
55-
echo "Fetching LGTM pack"
56-
LGTM_ARTIFACT_NAME="lgtm-cpp-query-pack.zip"
57-
LGTM_VERSIONED_ARTIFACT_NAME="lgtm-cpp-query-pack-v$VERSION.zip"
58-
gh run download $CODE_SCANNING_PACK_GEN_RUN_ID -n "$LGTM_ARTIFACT_NAME"
59-
mv "$LGTM_ARTIFACT_NAME" "$TEMP_DIR/$LGTM_VERSIONED_ARTIFACT_NAME"
60-
6143
echo "Generating release notes."
6244
python3 scripts/release/generate_release_notes.py > "$TEMP_DIR/release_notes_$VERSION.md"
6345
python3 scripts/release/create_supported_rules_list.py > "$TEMP_DIR/supported_rules_list_$VERSION.md"
6446
python3 scripts/release/create_supported_rules_list.py --csv > "$TEMP_DIR/supported_rules_list_$VERSION.csv"
6547

66-
gh release create "v$VERSION" -d --target "$BRANCH" -F "$TEMP_DIR/release_notes_$VERSION.md" -t "v$VERSION" "$TEMP_DIR/$LGTM_VERSIONED_ARTIFACT_NAME" "$TEMP_DIR/$CODE_SCANNING_VERSIONED_ARTIFACT_NAME" "$TEMP_DIR/$LGTM_ANON_VERSIONED_ARTIFACT_NAME" "$TEMP_DIR/$CODE_SCANNING_ANON_VERSIONED_ARTIFACT_NAME" "$TEMP_DIR/supported_rules_list_$VERSION.md" "$TEMP_DIR/supported_rules_list_$VERSION.csv" docs/user_manual.md
48+
gh release create "v$VERSION" -d --target "$BRANCH" -F "$TEMP_DIR/release_notes_$VERSION.md" -t "v$VERSION" "$TEMP_DIR/$CODE_SCANNING_VERSIONED_ARTIFACT_NAME" "$TEMP_DIR/supported_rules_list_$VERSION.md" "$TEMP_DIR/supported_rules_list_$VERSION.csv" docs/user_manual.md
6749

6850
curl \
6951
-X POST \

0 commit comments

Comments
 (0)