Skip to content

Commit 1e67907

Browse files
committed
Merge commit
2 parents 62ee6d3 + 7b25e22 commit 1e67907

File tree

795 files changed

+63564
-33928
lines changed

Some content is hidden

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

795 files changed

+63564
-33928
lines changed

.github/workflows/build-ripunzip.yml

Lines changed: 102 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,58 @@
1-
name: Build runzip
1+
name: Build ripunzip
22

33
on:
44
workflow_dispatch:
55
inputs:
66
ripunzip-version:
7-
description: "what reference to checktout from google/runzip"
7+
description: What reference to checkout from google/ripunzip. Latest by default
88
required: false
9-
default: v2.0.2
109
openssl-version:
11-
description: "what reference to checkout from openssl/openssl for Linux"
10+
description: What reference to checkout from openssl/openssl for Linux. Latest by default
1211
required: false
13-
default: openssl-3.5.0
12+
open-pr:
13+
description: Open a pull request updating the ripunzip versions committed to lfs
14+
required: false
15+
default: true # will be false on PRs
16+
pull_request:
17+
paths:
18+
- .github/workflows/build-ripunzip.yml
1419

20+
permissions: {}
21+
1522
jobs:
23+
versions:
24+
runs-on: ubuntu-slim
25+
outputs:
26+
ripunzip-version: ${{ inputs.ripunzip-version || steps.fetch-ripunzip-version.outputs.version }}
27+
openssl-version: ${{ inputs.openssl-version || steps.fetch-openssl-version.outputs.version }}
28+
steps:
29+
- name: Fetch latest ripunzip version
30+
id: fetch-ripunzip-version
31+
if: "!inputs.ripunzip-version"
32+
run: &fetch-version
33+
echo "version=$(gh release view --repo $REPO --json tagName --jq .tagName)" | tee -a $GITHUB_OUTPUT
34+
env:
35+
REPO: "google/ripunzip"
36+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37+
- name: Fetch latest openssl version
38+
id: fetch-openssl-version
39+
if: "!inputs.openssl-version"
40+
run: *fetch-version
41+
env:
42+
REPO: "openssl/openssl"
43+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1644
build:
45+
needs: versions
1746
strategy:
1847
fail-fast: false
1948
matrix:
20-
os: [ubuntu-22.04, macos-13, windows-2022]
49+
os: [ubuntu-24.04, macos-15, windows-2025]
2150
runs-on: ${{ matrix.os }}
2251
steps:
2352
- uses: actions/checkout@v5
2453
with:
2554
repository: google/ripunzip
26-
ref: ${{ inputs.ripunzip-version }}
55+
ref: ${{ needs.versions.outputs.ripunzip-version }}
2756
# we need to avoid ripunzip dynamically linking into libssl
2857
# see https://github.com/sfackler/rust-openssl/issues/183
2958
- if: runner.os == 'Linux'
@@ -32,7 +61,7 @@ jobs:
3261
with:
3362
repository: openssl/openssl
3463
path: openssl
35-
ref: ${{ inputs.openssl-version }}
64+
ref: ${{ needs.versions.outputs.openssl-version }}
3665
- if: runner.os == 'Linux'
3766
name: build and install openssl with fPIC
3867
shell: bash
@@ -64,11 +93,74 @@ jobs:
6493
lipo -create -output ripunzip-macos \
6594
-arch x86_64 target/x86_64-apple-darwin/release/ripunzip \
6695
-arch arm64 target/aarch64-apple-darwin/release/ripunzip
67-
- uses: actions/upload-artifact@v4
96+
- name: Archive
97+
shell: bash
98+
run: |
99+
tar acf ripunzip-$RUNNER_OS.tar.zst ripunzip-$(echo $RUNNER_OS | tr '[:upper:]' '[:lower:]')
100+
- name: Upload built binary
101+
uses: actions/upload-artifact@v4
68102
with:
69103
name: ripunzip-${{ runner.os }}
70-
path: ripunzip-*
104+
path: ripunzip-${{ runner.os }}.tar.zst
105+
retention-days: 5
106+
compression: 0
71107
- name: Check built binary
72108
shell: bash
73109
run: |
110+
rm -f ripunzip-*.tar.zst
74111
./ripunzip-* --version
112+
publish:
113+
needs: [versions, build]
114+
if: inputs.open-pr == 'true'
115+
permissions:
116+
contents: write
117+
pull-requests: write
118+
runs-on: ubuntu-slim
119+
steps:
120+
# workaround for git-lfs not being installed yet on ubuntu-slim runners
121+
- name: Ensure git-lfs is installed
122+
shell: bash
123+
run: |
124+
if which git-lfs &>/dev/null; then
125+
echo "git-lfs is already installed"
126+
exit 0
127+
fi
128+
cd $TMP
129+
gh release download --repo git-lfs/git-lfs --pattern "git-lfs-linux-amd64-*.tar.gz" --clobber
130+
tar xzf git-lfs-linux-amd64-*.tar.gz
131+
rm git-lfs-linux-amd64-*.tar.gz
132+
cd git-lfs-*
133+
pwd | tee -a $GITHUB_PATH
134+
env:
135+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
136+
- uses: actions/checkout@v5
137+
with:
138+
sparse-checkout: |
139+
.github
140+
misc/ripunzip
141+
lfs: true
142+
- name: Download built binaries
143+
uses: actions/download-artifact@v4
144+
with:
145+
merge-multiple: true
146+
path: misc/ripunzip
147+
- name: Open PR
148+
shell: bash
149+
run: |
150+
git config --global user.name "github-actions[bot]"
151+
git config --global user.email "github-actions[bot]@users.noreply.github.com"
152+
git switch -c update-ripunzip
153+
git add misc/ripunzip
154+
git commit -m "Update ripunzip binaries to version $VERSION"
155+
git push --set-upstream origin update-ripunzip --force
156+
TITLE="Update ripunzip binaries to version $VERSION"
157+
gh pr create \
158+
--draft \
159+
--title "$TITLE" \
160+
--body "Automated update of ripunzip binaries." \
161+
--assignee "$ACTOR" ||
162+
(gh pr edit --title "$TITLE" --add-assignee "$ACTOR" && gh pr ready --undo)
163+
env:
164+
ACTOR: ${{ github.actor }}
165+
VERSION: ${{ needs.versions.outputs.ripunzip-version }}
166+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CODEOWNERS

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,29 @@
55
/actions/ @github/codeql-dynamic
66
/cpp/ @github/codeql-c-analysis
77
/csharp/ @github/codeql-csharp
8-
/csharp/autobuilder/Semmle.Autobuild.Cpp @github/codeql-c-extractor
9-
/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests @github/codeql-c-extractor
8+
/csharp/autobuilder/Semmle.Autobuild.Cpp @github/codeql-c-extractor @github/code-scanning-language-coverage
9+
/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests @github/codeql-c-extractor @github/code-scanning-language-coverage
1010
/go/ @github/codeql-go
11+
/go/codeql-tools/ @github/codeql-go @github/code-scanning-language-coverage
12+
/go/downgrades/ @github/codeql-go @github/code-scanning-language-coverage
13+
/go/extractor/ @github/codeql-go @github/code-scanning-language-coverage
14+
/go/extractor-smoke-test/ @github/codeql-go @github/code-scanning-language-coverage
15+
/go/ql/test/extractor-tests/ @github/codeql-go @github/code-scanning-language-coverage
1116
/java/ @github/codeql-java
1217
/javascript/ @github/codeql-javascript
18+
/javascript/extractor/ @github/codeql-javascript @github/code-scanning-language-coverage
1319
/python/ @github/codeql-python
20+
/python/extractor/ @github/codeql-python @github/code-scanning-language-coverage
1421
/ql/ @github/codeql-ql-for-ql-reviewers
1522
/ruby/ @github/codeql-ruby
23+
/ruby/extractor/ @github/codeql-ruby @github/code-scanning-language-coverage
1624
/rust/ @github/codeql-rust
25+
/rust/extractor/ @github/codeql-rust @github/code-scanning-language-coverage
1726
/shared/ @github/codeql-shared-libraries-reviewers
1827
/swift/ @github/codeql-swift
28+
/swift/extractor/ @github/codeql-swift @github/code-scanning-language-coverage
1929
/misc/codegen/ @github/codeql-swift
20-
/java/kotlin-extractor/ @github/codeql-kotlin
30+
/java/kotlin-extractor/ @github/codeql-kotlin @github/code-scanning-language-coverage
2131
/java/ql/test-kotlin1/ @github/codeql-kotlin
2232
/java/ql/test-kotlin2/ @github/codeql-kotlin
2333

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,19 +273,19 @@ lfs_archive = use_repo_rule("//misc/bazel:lfs.bzl", "lfs_archive")
273273

274274
lfs_archive(
275275
name = "ripunzip-linux",
276-
src = "//misc/ripunzip:ripunzip-Linux.zip",
276+
src = "//misc/ripunzip:ripunzip-Linux.tar.zst",
277277
build_file = "//misc/ripunzip:BUILD.ripunzip.bazel",
278278
)
279279

280280
lfs_archive(
281281
name = "ripunzip-windows",
282-
src = "//misc/ripunzip:ripunzip-Windows.zip",
282+
src = "//misc/ripunzip:ripunzip-Windows.tar.zst",
283283
build_file = "//misc/ripunzip:BUILD.ripunzip.bazel",
284284
)
285285

286286
lfs_archive(
287287
name = "ripunzip-macos",
288-
src = "//misc/ripunzip:ripunzip-macOS.zip",
288+
src = "//misc/ripunzip:ripunzip-macOS.tar.zst",
289289
build_file = "//misc/ripunzip:BUILD.ripunzip.bazel",
290290
)
291291

actions/ql/lib/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.4.20
2+
3+
No user-facing changes.
4+
15
## 0.4.19
26

37
No user-facing changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## 0.4.20
2+
3+
No user-facing changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
lastReleaseVersion: 0.4.19
2+
lastReleaseVersion: 0.4.20

actions/ql/lib/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: codeql/actions-all
2-
version: 0.4.20-dev
2+
version: 0.4.21-dev
33
library: true
44
warnOnImplicitThis: true
55
dependencies:

actions/ql/src/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.6.12
2+
3+
No user-facing changes.
4+
15
## 0.6.11
26

37
No user-facing changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## 0.6.12
2+
3+
No user-facing changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
lastReleaseVersion: 0.6.11
2+
lastReleaseVersion: 0.6.12

0 commit comments

Comments
 (0)