Skip to content

Commit 9862303

Browse files
ricardo-valeroactions-userrekram1-node
authored
fix: update hix hashes for all systems (anomalyco#8732)
Co-authored-by: Github Action <action@github.com> Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
1 parent b146223 commit 9862303

File tree

2 files changed

+43
-36
lines changed

2 files changed

+43
-36
lines changed

‎.github/workflows/update-nix-hashes.yml‎

Lines changed: 39 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ on:
1717
- "packages/*/package.json"
1818

1919
jobs:
20-
update-linux:
20+
update-flake:
2121
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
22-
runs-on: blacksmith-4vcpu-ubuntu-2404
22+
runs-on: ubuntu-latest
2323
env:
24-
SYSTEM: x86_64-linux
24+
TITLE: flake.lock
2525

2626
steps:
2727
- name: Checkout repository
@@ -33,39 +33,32 @@ jobs:
3333
repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
3434

3535
- name: Setup Nix
36-
uses: DeterminateSystems/nix-installer-action@v20
36+
uses: nixbuild/nix-quick-install-action@v34
3737

3838
- name: Configure git
3939
run: |
4040
git config --global user.email "action@github.com"
4141
git config --global user.name "Github Action"
4242
43-
- name: Update flake.lock
43+
- name: Update ${{ env.TITLE }}
4444
run: |
4545
set -euo pipefail
46-
echo "📦 Updating flake.lock..."
46+
echo "📦 Updating $TITLE..."
4747
nix flake update
48-
echo "✅ flake.lock updated successfully"
48+
echo "✅ $TITLE updated successfully"
4949
50-
- name: Update node_modules hash for x86_64-linux
51-
run: |
52-
set -euo pipefail
53-
echo "🔄 Updating node_modules hash for x86_64-linux..."
54-
nix/scripts/update-hashes.sh
55-
echo "✅ node_modules hash for x86_64-linux updated successfully"
56-
57-
- name: Commit Linux hash changes
50+
- name: Commit ${{ env.TITLE }} changes
5851
env:
5952
TARGET_BRANCH: ${{ github.head_ref || github.ref_name }}
6053
run: |
6154
set -euo pipefail
6255
63-
echo "🔍 Checking for changes in tracked Nix files..."
56+
echo "🔍 Checking for changes in tracked files..."
6457
6558
summarize() {
6659
local status="$1"
6760
{
68-
echo "### Nix Hash Update (x86_64-linux)"
61+
echo "### Nix $TITLE"
6962
echo ""
7063
echo "- ref: ${GITHUB_REF_NAME}"
7164
echo "- status: ${status}"
@@ -75,11 +68,10 @@ jobs:
7568
fi
7669
echo "" >> "$GITHUB_STEP_SUMMARY"
7770
}
78-
79-
FILES=(flake.lock flake.nix nix/node-modules.nix nix/hashes.json)
71+
FILES=(flake.lock flake.nix)
8072
STATUS="$(git status --short -- "${FILES[@]}" || true)"
8173
if [ -z "$STATUS" ]; then
82-
echo "✅ No changes detected. Hashes are already up to date."
74+
echo "✅ No changes detected."
8375
summarize "no changes"
8476
exit 0
8577
fi
@@ -89,7 +81,7 @@ jobs:
8981
echo "🔗 Staging files..."
9082
git add "${FILES[@]}"
9183
echo "💾 Committing changes..."
92-
git commit -m "Update Nix flake.lock and x86_64-linux hash"
84+
git commit -m "Update $TITLE"
9385
echo "✅ Changes committed"
9486
9587
BRANCH="${TARGET_BRANCH:-${GITHUB_REF_NAME}}"
@@ -101,12 +93,25 @@ jobs:
10193
10294
summarize "committed $(git rev-parse --short HEAD)"
10395
104-
update-macos:
105-
needs: update-linux
96+
update-node-modules-hash:
97+
needs: update-flake
10698
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
107-
runs-on: macos-latest
99+
strategy:
100+
fail-fast: false
101+
matrix:
102+
include:
103+
- system: x86_64-linux
104+
host: ubuntu-latest
105+
- system: aarch64-linux
106+
host: ubuntu-22.04-arm
107+
- system: x86_64-darwin
108+
host: macos-15-intel
109+
- system: aarch64-darwin
110+
host: macos-latest
111+
runs-on: ${{ matrix.host }}
108112
env:
109-
SYSTEM: aarch64-darwin
113+
SYSTEM: ${{ matrix.system }}
114+
TITLE: node_modules hash (${{ matrix.system }})
110115

111116
steps:
112117
- name: Checkout repository
@@ -118,7 +123,7 @@ jobs:
118123
repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
119124

120125
- name: Setup Nix
121-
uses: DeterminateSystems/nix-installer-action@v20
126+
uses: nixbuild/nix-quick-install-action@v34
122127

123128
- name: Configure git
124129
run: |
@@ -132,25 +137,25 @@ jobs:
132137
BRANCH="${TARGET_BRANCH:-${GITHUB_REF_NAME}}"
133138
git pull origin "$BRANCH"
134139
135-
- name: Update node_modules hash for aarch64-darwin
140+
- name: Update ${{ env.TITLE }}
136141
run: |
137142
set -euo pipefail
138-
echo "🔄 Updating node_modules hash for aarch64-darwin..."
143+
echo "🔄 Updating $TITLE..."
139144
nix/scripts/update-hashes.sh
140-
echo "✅ node_modules hash for aarch64-darwin updated successfully"
145+
echo "✅ $TITLE updated successfully"
141146
142-
- name: Commit macOS hash changes
147+
- name: Commit ${{ env.TITLE }} changes
143148
env:
144149
TARGET_BRANCH: ${{ github.head_ref || github.ref_name }}
145150
run: |
146151
set -euo pipefail
147152
148-
echo "🔍 Checking for changes in tracked Nix files..."
153+
echo "🔍 Checking for changes in tracked files..."
149154
150155
summarize() {
151156
local status="$1"
152157
{
153-
echo "### Nix Hash Update (aarch64-darwin)"
158+
echo "### Nix $TITLE"
154159
echo ""
155160
echo "- ref: ${GITHUB_REF_NAME}"
156161
echo "- status: ${status}"
@@ -164,7 +169,7 @@ jobs:
164169
FILES=(nix/hashes.json)
165170
STATUS="$(git status --short -- "${FILES[@]}" || true)"
166171
if [ -z "$STATUS" ]; then
167-
echo "✅ No changes detected. Hash is already up to date."
172+
echo "✅ No changes detected."
168173
summarize "no changes"
169174
exit 0
170175
fi
@@ -174,7 +179,7 @@ jobs:
174179
echo "🔗 Staging files..."
175180
git add "${FILES[@]}"
176181
echo "💾 Committing changes..."
177-
git commit -m "Update aarch64-darwin hash"
182+
git commit -m "Update $TITLE"
178183
echo "✅ Changes committed"
179184
180185
BRANCH="${TARGET_BRANCH:-${GITHUB_REF_NAME}}"

‎nix/hashes.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"nodeModules": {
3-
"x86_64-linux": "sha256-Fl1BdjNSg19LJVSgDMiBX8JuTaGlL2I5T+rqLfjSeO4=",
4-
"aarch64-darwin": "sha256-7UajHu40n7JKqurU/+CGlitErsVFA2qDneUytI8+/zQ="
3+
"x86_64-linux": "sha256-4ndHIlS9t1ynRdFszJ1nvcu3YhunhuOc7jcuHI1FbnM=",
4+
"aarch64-linux": "sha256-H9eUk/yVrQqVrAYONlb6As7mjkPXtOauBVfMBeVAmRo=",
5+
"aarch64-darwin": "sha256-C0E9KAEj3GI83HwirIL2zlXYIe92T+7Iv6F51BB6slY=",
6+
"x86_64-darwin": "sha256-wj5fZnyfu6Sf1HcqvsQM3M7dl5BKRAHmoqm1Ai1cL2M="
57
}
68
}

0 commit comments

Comments
 (0)