Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Review GitHub Actions dependency updates

Manav Rathie497c841a4be
diff --git a/.github/actions/setup-rust-linux/action.yml b/.github/actions/setup-rust-linux/action.yml
new file mode 100644
index 0000000000..fc04de5cf9
--- /dev/null
+++ b/.github/actions/setup-rust-linux/action.yml
@@ -0,0 +1,11 @@
+name: Setup Linux for Rust
+description: Free disk space and install Linux build and test dependencies
+
+runs:
+ using: composite
+ steps:
+ - shell: bash
+ run: |
+ sudo rm -rf /usr/share/dotnet
+ sudo apt-get update
+ sudo apt-get install -y libwebkit2gtk-4.1-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev libvulkan-dev glslc spirv-headers libdbus-1-dev dbus gnome-keyring libglib2.0-bin
diff --git a/.github/scripts/ci/paths.json b/.github/scripts/ci/paths.json
index 40df139811..a7d573cdd6 100644
--- a/.github/scripts/ci/paths.json
+++ b/.github/scripts/ci/paths.json
@@ -122,11 +122,13 @@
],
"rust-lint": [
".github/actions/restore-rust-target/**",
+ ".github/actions/setup-rust-linux/**",
".github/workflows/rust-lint.yml",
"rust/**"
],
"rust-test": [
".github/actions/restore-rust-target/**",
+ ".github/actions/setup-rust-linux/**",
".github/workflows/rust-test.yml",
"rust/**",
"server/**"
diff --git a/.github/workflows/dependabot-follow-up.yml b/.github/workflows/dependabot-follow-up.yml
index efcb3e5dcd..e26f236ed6 100644
--- a/.github/workflows/dependabot-follow-up.yml
+++ b/.github/workflows/dependabot-follow-up.yml
@@ -34,7 +34,7 @@ jobs:
const selected = [];
for (const pr of await github.paginate(github.rest.pulls.list, { ...repo, state: "open", base: "main", per_page: 100 })) {
if (pr.draft || pr.user.login !== "dependabot[bot]" ||
- pr.head.repo?.full_name !== `${repo.owner}/${repo.repo}` || !pr.head.ref.startsWith("dependabot/cargo/")) continue;
+ pr.head.repo?.full_name !== `${repo.owner}/${repo.repo}` || !/^dependabot\/(cargo|github_actions)\//.test(pr.head.ref)) continue;
const runs = await github.paginate(github.rest.actions.listWorkflowRuns, {
...repo, workflow_id: "ci.yml", event: "pull_request", head_sha: pr.head.sha, per_page: 100,
});
@@ -46,7 +46,7 @@ jobs:
comments.some(comment => comment.user.login !== "ente-agent[bot]" && comment.created_at > since &&
(["OWNER", "MEMBER", "COLLABORATOR"].includes(comment.author_association) ||
comment.user.login === "github-actions[bot]"))) {
- selected.push({ number: pr.number, head: pr.head.sha });
+ selected.push({ number: pr.number, head: pr.head.sha, reviewOnly: pr.head.ref.startsWith("dependabot/github_actions/") });
}
}
return selected;
@@ -75,6 +75,9 @@ jobs:
mkdir -p "$RUNNER_TEMP/codex" "$RUNNER_TEMP/result"
touch "$RUNNER_TEMP/result/report.md"
{ printf '%s\n\n' "$PR_URL"; cat .github/scripts/dependencies.md; } > "$RUNNER_TEMP/prompt.md"
+ if [[ "${{ matrix.pr.reviewOnly }}" == true ]]; then
+ printf '\n%s\n' "Review only. Do not edit files; recommend any required fixes in your final report." >> "$RUNNER_TEMP/prompt.md"
+ fi
cat > "$RUNNER_TEMP/codex/config.toml" <<EOF
project_doc_max_bytes = 0
[skills]
@@ -88,9 +91,10 @@ jobs:
[permissions.update.network]
enabled = true
EOF
- sudo rm -rf /usr/share/dotnet
- sudo apt-get update
- sudo apt-get install -y libwebkit2gtk-4.1-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev libvulkan-dev glslc libdbus-1-dev dbus gnome-keyring libglib2.0-bin
+
+ - name: Setup Linux for Rust
+ if: ${{ !matrix.pr.reviewOnly }}
+ uses: ./.github/actions/setup-rust-linux
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
@@ -176,10 +180,10 @@ jobs:
const { data: pr } = await github.rest.pulls.get({ ...repo, pull_number: Number(process.env.PR_NUMBER) });
if (pr.state !== "open" || pr.draft || pr.head.sha !== head || pr.base.ref !== "main" ||
pr.user.login !== "dependabot[bot]" || pr.head.repo?.full_name !== `${repo.owner}/${repo.repo}` ||
- !pr.head.ref.startsWith("dependabot/cargo/")) return;
+ !/^dependabot\/(cargo|github_actions)\//.test(pr.head.ref)) return;
const result = `${process.env.RUNNER_TEMP}/result`;
const report = readFileSync(`${result}/report.md`, "utf8").trim();
- if (readFileSync(`${result}/changes.patch`).length) {
+ if (pr.head.ref.startsWith("dependabot/cargo/") && readFileSync(`${result}/changes.patch`).length) {
git("apply", "--index", `${result}/changes.patch`);
const { data: bot } = await github.rest.users.getByUsername({ username: "ente-agent[bot]" });
git("config", "user.name", bot.login);
diff --git a/.github/workflows/rust-lint.yml b/.github/workflows/rust-lint.yml
index 2eecf185d9..84df5abf7e 100644
--- a/.github/workflows/rust-lint.yml
+++ b/.github/workflows/rust-lint.yml
@@ -19,13 +19,8 @@ jobs:
- name: Checkout
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- - name: Free runner disk space
- run: sudo rm -rf /usr/share/dotnet
-
- - name: Install Linux dependencies
- run: |
- sudo apt-get update
- sudo apt-get install -y libwebkit2gtk-4.1-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev libvulkan-dev glslc spirv-headers libdbus-1-dev
+ - name: Setup Linux for Rust
+ uses: ./.github/actions/setup-rust-linux
# Restore-only; primed on main by warm-caches.yml.
- name: Restore Rust cache
diff --git a/.github/workflows/rust-test.yml b/.github/workflows/rust-test.yml
index 658f099f64..b302cca76e 100644
--- a/.github/workflows/rust-test.yml
+++ b/.github/workflows/rust-test.yml
@@ -24,13 +24,8 @@ jobs:
- name: Checkout
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- - name: Free runner disk space
- run: sudo rm -rf /usr/share/dotnet
-
- - name: Install Linux dependencies
- run: |
- sudo apt-get update
- sudo apt-get install -y libwebkit2gtk-4.1-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev libvulkan-dev glslc spirv-headers libdbus-1-dev dbus gnome-keyring libglib2.0-bin
+ - name: Setup Linux for Rust
+ uses: ./.github/actions/setup-rust-linux
- name: Setup go
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
diff --git a/.github/workflows/warm-caches.yml b/.github/workflows/warm-caches.yml
index f29f697dd3..433f370618 100644
--- a/.github/workflows/warm-caches.yml
+++ b/.github/workflows/warm-caches.yml
@@ -31,13 +31,8 @@ jobs:
go-version-file: server/go.mod
cache: false
- - name: Free runner disk space
- run: sudo rm -rf /usr/share/dotnet
-
- - name: Install Linux dependencies
- run: |
- sudo apt-get update
- sudo apt-get install -y libwebkit2gtk-4.1-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev libvulkan-dev glslc spirv-headers libdbus-1-dev
+ - name: Setup Linux for Rust
+ uses: ./.github/actions/setup-rust-linux
- name: Setup Rust cache
uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2