From 880773c861de735149b4fbbb86d5d85dccd45023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= <sjchmiela@gmail.com>
Date: Tue, 6 Feb 2024 22:42:01 +0100
Subject: [PATCH 1/6] Upgrade @expo/steps and add a workflow for triggering
---
.../workflows/update-eas-build-modules.yml | 69 +++++++++++++++++++
packages/eas-cli/package.json | 2 +-
yarn.lock | 35 ++++++----
3 files changed, 90 insertions(+), 16 deletions(-)
create mode 100644 .github/workflows/update-eas-build-modules.yml
diff --git a/.github/workflows/update-eas-build-modules.yml b/.github/workflows/update-eas-build-modules.yml
new file mode 100644
index 0000000000..34b6ddb186
--- /dev/null
+++ b/.github/workflows/update-eas-build-modules.yml
@@ -0,0 +1,69 @@
+name: Open a PR bumping eas-build modules
+
+on: workflow_dispatch
+
+jobs:
+ open-pr:
+ name: Open a PR bumping eas-build modules
+ runs-on: expo-small
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+ with:
+ ref: main
+ token: ${{ secrets.EXPO_BOT_PAT }}
+
+ - name: Setup node
+ uses: actions/setup-node@v2
+ with:
+ node-version: 20
+
+ - run: yarn install --frozen-lockfile
+
+ - name: Configure git
+ run: |
+ git config --global user.email "support+ci@expo.io"
+ git config --global user.name "Expo Bot"
+
+ - name: Update eas-build modules
+ run: |
+ for DIR in packages/eas-cli packages/eas-json; do
+ pushd $DIR >/dev/null 2>&1
+ # packages are ordered according to output of `lerna list --toposort`
+ # https://github.com/expo/turtle-v2/pull/568
+ for PACKAGE in "@expo/downloader" "@expo/eas-build-job" "@expo/logger" "@expo/template-file" "@expo/turtle-spawn" "@expo/fastlane" "@expo/build-tools"; do
+ if grep -q $PACKAGE package.json; then
+ echo "[$DIR] yarn --exact add $PACKAGE"
+ yarn add --exact $PACKAGE
+ fi
+ done
+ popd >/dev/null 2>&1
+ done
+
+ - name: Set a branch name
+ id: bump-branch-name
+ run: |
+ HASH="$(echo $RANDOM | md5sum | head -c 10)"
+ BRANCH_NAME="@expo-bot/eas-build-bump-$HASH"
+
+ echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT
+
+ - name: Create a branch, commit, and push
+ run: |
+ BRANCH_NAME="${{ steps.bump-branch-name.outputs.BRANCH_NAME }}"
+
+ git checkout -b $BRANCH_NAME
+ git add .
+ git commit -m "Update eas-build dependencies"
+ git push origin $BRANCH_NAME
+
+ - name: Open a PR to main
+ uses: repo-sync/pull-request@v2
+ with:
+ source_branch: '${{ steps.bump-branch-name.outputs.BRANCH_NAME }}'
+ destination_branch: 'main'
+ pr_title: 'Update eas-build dependencies'
+ pr_body: ':arrow_up: Updates [`eas-build`](https://github.com/expo/eas-build) dependencies.'
+ pr_reviewer: 'szdziedzic,radoslawkrzemien,sjchmiela,khamilowicz'
+ github_token: ${{ secrets.EXPO_BOT_PAT }}
diff --git a/packages/eas-cli/package.json b/packages/eas-cli/package.json
index 0aaaa8c3a8..cdf8a866bb 100644
--- a/packages/eas-cli/package.json
+++ b/packages/eas-cli/package.json
@@ -27,7 +27,7 @@
"@expo/results": "1.0.0",
"@expo/rudder-sdk-node": "1.1.1",
"@expo/spawn-async": "1.7.0",
- "@expo/steps": "1.0.51",
+ "@expo/steps": "1.0.66",
"@expo/timeago.js": "1.0.0",
"@oclif/core": "^1.26.2",
"@oclif/plugin-autocomplete": "^2.3.10",
diff --git a/yarn.lock b/yarn.lock
index 7f0254247a..da1406e9ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1525,10 +1525,10 @@
json5 "^2.2.2"
write-file-atomic "^2.3.0"
-"@expo/logger@1.0.37":
- version "1.0.37"
- resolved "https://registry.yarnpkg.com/@expo/logger/-/logger-1.0.37.tgz#79b2336d4e9ed70bd19a53168eb91d6a899f11d8"
- integrity sha512-Xx3pt7FCsUkjsnu3lJoGp/LXYqoa5TyYx1/lgvfz4NSRgUT+5f6LNiYIowUjXab80PbW3gA/KqHYY9V7iZm8aQ==
+"@expo/logger@1.0.57":
+ version "1.0.57"
+ resolved "https://registry.yarnpkg.com/@expo/logger/-/logger-1.0.57.tgz#b64dfb29a06e8ca476905dd445a0e105fd919bcc"
+ integrity sha512-kd/1MOrVST9gQtnTD+qAV3KdrYCV9oShzIqYek+5XI3M/6QNvfv8IPr2pv+xaYZoCZgnNdI4ViWo0eYBDJMngA==
dependencies:
"@types/bunyan" "^1.8.8"
bunyan "^1.8.15"
@@ -1673,21 +1673,21 @@
dependencies:
cross-spawn "^7.0.3"
-"@expo/steps@1.0.51":
- version "1.0.51"
- resolved "https://registry.yarnpkg.com/@expo/steps/-/steps-1.0.51.tgz#79aad4eb556e38a9f1c21703ebbea3af4f068807"
- integrity sha512-S+2ESok2+kMjqWqJIK6p7Uk3aXf0hEbl7x10n1QBQdFzpkQmcNmpyNguOiFYyaj9dRleG2aPbwCv942m37VQWw==
+"@expo/steps@1.0.66":
+ version "1.0.66"
+ resolved "https://registry.yarnpkg.com/@expo/steps/-/steps-1.0.66.tgz#904746a7cd34deed0f7b3eab33c6248835add388"
+ integrity sha512-9J+l9kzZFPtS6OtVeYVySASM91m12t4WuRPvnvgMEm8iuTDR95KTt14EAIHYURsoNT43Ga2N5oYz9u78O0Pi4A==
dependencies:
- "@expo/logger" "1.0.37"
+ "@expo/logger" "1.0.57"
"@expo/spawn-async" "^1.7.2"
arg "^5.0.2"
- fs-extra "^11.1.1"
- joi "^17.9.2"
+ fs-extra "^11.2.0"
+ joi "^17.11.0"
lodash.clonedeep "^4.5.0"
lodash.get "^4.4.2"
this-file "^2.0.3"
- uuid "^9.0.0"
- yaml "^2.3.1"
+ uuid "^9.0.1"
+ yaml "^2.3.4"
"@expo/timeago.js@1.0.0":
version "1.0.0"
@@ -7160,7 +7160,7 @@ fs-constants@^1.0.0:
resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-fs-extra@11.2.0:
+fs-extra@11.2.0, fs-extra@^11.2.0:
version "11.2.0"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
@@ -13724,7 +13724,7 @@ uuid@8.0.0:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c"
integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==
-uuid@9.0.1:
+uuid@9.0.1, uuid@^9.0.1:
version "9.0.1"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
@@ -14192,6 +14192,11 @@ yaml@^2.3.1:
resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b"
integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==
+yaml@^2.3.4:
+ version "2.3.4"
+ resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.4.tgz#53fc1d514be80aabf386dc6001eb29bf3b7523b2"
+ integrity sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==
+
yargs-parser@20.2.4, yargs-parser@^20.2.2:
version "20.2.4"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
From 776bbd462fad4dcb832c21f413bbe39442329115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= <sjchmiela@gmail.com>
Date: Tue, 6 Feb 2024 22:43:08 +0100
Subject: [PATCH 2/6] Test workflow
---
.github/workflows/update-eas-build-modules.yml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/update-eas-build-modules.yml b/.github/workflows/update-eas-build-modules.yml
index 34b6ddb186..0993d84780 100644
--- a/.github/workflows/update-eas-build-modules.yml
+++ b/.github/workflows/update-eas-build-modules.yml
@@ -1,11 +1,15 @@
name: Open a PR bumping eas-build modules
-on: workflow_dispatch
+on:
+ workflow_dispatch: {}
+ pull_request:
+ paths:
+ - .github/workflows/update-eas-build-modules.yml
jobs:
open-pr:
name: Open a PR bumping eas-build modules
- runs-on: expo-small
+ runs-on: ubuntu-latest
steps:
- name: Checkout
From a8855c0cd1a23e015fa86ba9380d418dd3dcac5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= <sjchmiela@gmail.com>
Date: Tue, 6 Feb 2024 23:10:21 +0100
Subject: [PATCH 3/6] Fix modules list
---
.github/workflows/update-eas-build-modules.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/update-eas-build-modules.yml b/.github/workflows/update-eas-build-modules.yml
index 0993d84780..8f8c18b575 100644
--- a/.github/workflows/update-eas-build-modules.yml
+++ b/.github/workflows/update-eas-build-modules.yml
@@ -36,7 +36,7 @@ jobs:
pushd $DIR >/dev/null 2>&1
# packages are ordered according to output of `lerna list --toposort`
# https://github.com/expo/turtle-v2/pull/568
- for PACKAGE in "@expo/downloader" "@expo/eas-build-job" "@expo/logger" "@expo/template-file" "@expo/turtle-spawn" "@expo/fastlane" "@expo/build-tools"; do
+ for PACKAGE in "@expo/downloader" "@expo/eas-build-job" "@expo/logger" "@expo/template-file" "@expo/steps" "@expo/turtle-spawn" "@expo/build-tools"; do
if grep -q $PACKAGE package.json; then
echo "[$DIR] yarn --exact add $PACKAGE"
yarn add --exact $PACKAGE
From 90e1d08918e680e818db0c341fe9eab8b8dba28c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= <sjchmiela@gmail.com>
Date: Tue, 6 Feb 2024 23:15:39 +0100
Subject: [PATCH 4/6] Fixup
---
...ules.yml => upgrade-eas-build-modules.yml} | 25 ++++++++++++++-----
1 file changed, 19 insertions(+), 6 deletions(-)
rename .github/workflows/{update-eas-build-modules.yml => upgrade-eas-build-modules.yml} (69%)
diff --git a/.github/workflows/update-eas-build-modules.yml b/.github/workflows/upgrade-eas-build-modules.yml
similarity index 69%
rename from .github/workflows/update-eas-build-modules.yml
rename to .github/workflows/upgrade-eas-build-modules.yml
index 8f8c18b575..58eafb5b4b 100644
--- a/.github/workflows/update-eas-build-modules.yml
+++ b/.github/workflows/upgrade-eas-build-modules.yml
@@ -4,7 +4,7 @@ on:
workflow_dispatch: {}
pull_request:
paths:
- - .github/workflows/update-eas-build-modules.yml
+ - .github/workflows/upgrade-eas-build-modules.yml
jobs:
open-pr:
@@ -30,7 +30,7 @@ jobs:
git config --global user.email "support+ci@expo.io"
git config --global user.name "Expo Bot"
- - name: Update eas-build modules
+ - name: Upgrade eas-build modules
run: |
for DIR in packages/eas-cli packages/eas-json; do
pushd $DIR >/dev/null 2>&1
@@ -59,15 +59,28 @@ jobs:
git checkout -b $BRANCH_NAME
git add .
- git commit -m "Update eas-build dependencies"
+ git commit -m "Upgrade eas-build dependencies"
git push origin $BRANCH_NAME
- name: Open a PR to main
uses: repo-sync/pull-request@v2
+ id: open-pr
with:
source_branch: '${{ steps.bump-branch-name.outputs.BRANCH_NAME }}'
destination_branch: 'main'
- pr_title: 'Update eas-build dependencies'
- pr_body: ':arrow_up: Updates [`eas-build`](https://github.com/expo/eas-build) dependencies.'
- pr_reviewer: 'szdziedzic,radoslawkrzemien,sjchmiela,khamilowicz'
+ pr_title: 'Upgrade eas-build dependencies'
+ pr_body: ':arrow_up: Upgrades [`eas-build`](https://github.com/expo/eas-build) dependencies.'
+ # pr_reviewer: 'szdziedzic,radoslawkrzemien,sjchmiela,khamilowicz'
+ pr_reviewer: 'sjchmiela'
github_token: ${{ secrets.EXPO_BOT_PAT }}
+
+ - uses: actions/github-script@v3
+ with:
+ github-token: ${{ secrets.EXPO_BOT_PAT }}
+ script: |
+ github.issues.createComment({
+ issue_number: ${{ steps.open-pr.outputs.pr_number }},
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ body: "/changelog-entry chore Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies."
+ })
From 4e35f0ad73bedecbc0b4c867ff621c84d4c2a747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= <sjchmiela@gmail.com>
Date: Tue, 6 Feb 2024 23:23:41 +0100
Subject: [PATCH 5/6] Limit PR to workflow
---
packages/eas-cli/package.json | 2 +-
yarn.lock | 35 +++++++++++++++--------------------
2 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/packages/eas-cli/package.json b/packages/eas-cli/package.json
index cdf8a866bb..0aaaa8c3a8 100644
--- a/packages/eas-cli/package.json
+++ b/packages/eas-cli/package.json
@@ -27,7 +27,7 @@
"@expo/results": "1.0.0",
"@expo/rudder-sdk-node": "1.1.1",
"@expo/spawn-async": "1.7.0",
- "@expo/steps": "1.0.66",
+ "@expo/steps": "1.0.51",
"@expo/timeago.js": "1.0.0",
"@oclif/core": "^1.26.2",
"@oclif/plugin-autocomplete": "^2.3.10",
diff --git a/yarn.lock b/yarn.lock
index da1406e9ca..7f0254247a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1525,10 +1525,10 @@
json5 "^2.2.2"
write-file-atomic "^2.3.0"
-"@expo/logger@1.0.57":
- version "1.0.57"
- resolved "https://registry.yarnpkg.com/@expo/logger/-/logger-1.0.57.tgz#b64dfb29a06e8ca476905dd445a0e105fd919bcc"
- integrity sha512-kd/1MOrVST9gQtnTD+qAV3KdrYCV9oShzIqYek+5XI3M/6QNvfv8IPr2pv+xaYZoCZgnNdI4ViWo0eYBDJMngA==
+"@expo/logger@1.0.37":
+ version "1.0.37"
+ resolved "https://registry.yarnpkg.com/@expo/logger/-/logger-1.0.37.tgz#79b2336d4e9ed70bd19a53168eb91d6a899f11d8"
+ integrity sha512-Xx3pt7FCsUkjsnu3lJoGp/LXYqoa5TyYx1/lgvfz4NSRgUT+5f6LNiYIowUjXab80PbW3gA/KqHYY9V7iZm8aQ==
dependencies:
"@types/bunyan" "^1.8.8"
bunyan "^1.8.15"
@@ -1673,21 +1673,21 @@
dependencies:
cross-spawn "^7.0.3"
-"@expo/steps@1.0.66":
- version "1.0.66"
- resolved "https://registry.yarnpkg.com/@expo/steps/-/steps-1.0.66.tgz#904746a7cd34deed0f7b3eab33c6248835add388"
- integrity sha512-9J+l9kzZFPtS6OtVeYVySASM91m12t4WuRPvnvgMEm8iuTDR95KTt14EAIHYURsoNT43Ga2N5oYz9u78O0Pi4A==
+"@expo/steps@1.0.51":
+ version "1.0.51"
+ resolved "https://registry.yarnpkg.com/@expo/steps/-/steps-1.0.51.tgz#79aad4eb556e38a9f1c21703ebbea3af4f068807"
+ integrity sha512-S+2ESok2+kMjqWqJIK6p7Uk3aXf0hEbl7x10n1QBQdFzpkQmcNmpyNguOiFYyaj9dRleG2aPbwCv942m37VQWw==
dependencies:
- "@expo/logger" "1.0.57"
+ "@expo/logger" "1.0.37"
"@expo/spawn-async" "^1.7.2"
arg "^5.0.2"
- fs-extra "^11.2.0"
- joi "^17.11.0"
+ fs-extra "^11.1.1"
+ joi "^17.9.2"
lodash.clonedeep "^4.5.0"
lodash.get "^4.4.2"
this-file "^2.0.3"
- uuid "^9.0.1"
- yaml "^2.3.4"
+ uuid "^9.0.0"
+ yaml "^2.3.1"
"@expo/timeago.js@1.0.0":
version "1.0.0"
@@ -7160,7 +7160,7 @@ fs-constants@^1.0.0:
resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-fs-extra@11.2.0, fs-extra@^11.2.0:
+fs-extra@11.2.0:
version "11.2.0"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
@@ -13724,7 +13724,7 @@ uuid@8.0.0:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c"
integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==
-uuid@9.0.1, uuid@^9.0.1:
+uuid@9.0.1:
version "9.0.1"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
@@ -14192,11 +14192,6 @@ yaml@^2.3.1:
resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b"
integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==
-yaml@^2.3.4:
- version "2.3.4"
- resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.4.tgz#53fc1d514be80aabf386dc6001eb29bf3b7523b2"
- integrity sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==
-
yargs-parser@20.2.4, yargs-parser@^20.2.2:
version "20.2.4"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
From e1c8c813999a689e29e9764d46cac4178d3b35c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= <sjchmiela@gmail.com>
Date: Tue, 6 Feb 2024 23:24:26 +0100
Subject: [PATCH 6/6] Fixup
---
.github/workflows/upgrade-eas-build-modules.yml | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/upgrade-eas-build-modules.yml b/.github/workflows/upgrade-eas-build-modules.yml
index 58eafb5b4b..1ac8d4c372 100644
--- a/.github/workflows/upgrade-eas-build-modules.yml
+++ b/.github/workflows/upgrade-eas-build-modules.yml
@@ -1,10 +1,6 @@
name: Open a PR bumping eas-build modules
-on:
- workflow_dispatch: {}
- pull_request:
- paths:
- - .github/workflows/upgrade-eas-build-modules.yml
+on: workflow_dispatch
jobs:
open-pr:
@@ -70,8 +66,7 @@ jobs:
destination_branch: 'main'
pr_title: 'Upgrade eas-build dependencies'
pr_body: ':arrow_up: Upgrades [`eas-build`](https://github.com/expo/eas-build) dependencies.'
- # pr_reviewer: 'szdziedzic,radoslawkrzemien,sjchmiela,khamilowicz'
- pr_reviewer: 'sjchmiela'
+ pr_reviewer: 'szdziedzic,radoslawkrzemien,sjchmiela,khamilowicz'
github_token: ${{ secrets.EXPO_BOT_PAT }}
- uses: actions/github-script@v3