Skip to content

Commit a98a7b8

Browse files
authored
Merge branch 'main' into switch-parameters
2 parents 09ebc76 + 7462e40 commit a98a7b8

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

.github/workflows/sync-main-tags.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Sync Main Tags
2+
3+
on:
4+
pull_request:
5+
types:
6+
- closed
7+
branches:
8+
- main
9+
10+
jobs:
11+
sync-main-tags:
12+
name: Sync Main Tags
13+
runs-on: ubuntu-latest
14+
if: github.repository == 'microsoft/codeql' && github.event.pull_request.merged == true && github.event.pull_request.head.ref == 'auto/sync-main-pr'
15+
permissions:
16+
contents: write
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v3
20+
with:
21+
fetch-depth: 0
22+
- name: Push Tags
23+
run: |
24+
git fetch upstream --tags --force
25+
git push --force origin --tags
26+
env:
27+
GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}

rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ final class DataFlowCall extends TDataFlowCall {
9595

9696
//** TODO JB1: Move to subclass, monkey patching for #153 */
9797
DataFlowCallable getARuntimeTarget(){ none() }
98-
Node::ArgumentNode getAnArgumentNode(){ none() }
98+
ArgumentNode getAnArgumentNode(){ none() }
9999
int totalorder(){ none() }
100100
//** TODO JB1: end stubs for #153 */
101101
}

0 commit comments

Comments
 (0)