Fix CI sync runs (#2659)

* Fix CI sync runs * Abstract user level installs out * Fix ci_setup_deps_target * Remove unused
DeFiCh · Nov 2, 2023 · 538abe7 · 538abe7
1 parent db3ef97
commit 538abe7
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 28 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -54,8 +54,8 @@ jobs:
     - name: Setup dependencies
       run: ./make.sh ci-setup-deps
 
-    - name: Setup dependencies for target
-      run: ./make.sh ci-setup-deps-target
+    - name: Setup dependencies for user
+      run: ./make.sh ci-setup-user-deps
 
     - uses: Swatinem/rust-cache@v2
       with:

diff --git a/.github/workflows/tests-ethlibs.yaml b/.github/workflows/tests-ethlibs.yaml
@@ -31,8 +31,8 @@ jobs:
     - name: Setup dependencies
       run: ./make.sh ci-setup-deps
 
-    - name: Setup dependencies for target
-      run: ./make.sh ci-setup-deps-target
+    - name: Setup dependencies for user
+      run: ./make.sh ci-setup-user-deps
 
     - uses: Swatinem/rust-cache@v2
       with:

diff --git a/.github/workflows/tests-frontier.yml b/.github/workflows/tests-frontier.yml
@@ -24,8 +24,8 @@ jobs:
     - name: Setup dependencies
       run: sudo ./make.sh ci-setup-deps
 
-    - name: Setup dependencies for target
-      run: ./make.sh ci-setup-deps-target
+    - name: Setup dependencies for user
+      run: ./make.sh ci-setup-user-deps
 
     - uses: Swatinem/rust-cache@v2
       with:

diff --git a/.github/workflows/tests-sync.yml b/.github/workflows/tests-sync.yml
@@ -3,12 +3,12 @@ on:
   workflow_dispatch:
     inputs:
       block_ranges:
-        description: 'Optionally restrict to specific block ranges. Should be
-          formatted as multiple start block, such as "350000 50000 750000".
-          Defaults to all block ranges'
+        description: 'Block ranges: Format: "<start-block-1> <start-block-2>" 
+          Eg: "350000 50000 750000".
+          Default: All available ranges when empty'
         required: false
       name:
-        description: 'Workflow run custom name'
+        description: 'Custom name for the workflow run'
         required: false
   pull_request:
     branches:
@@ -36,8 +36,8 @@ jobs:
     - name: Setup dependencies
       run: sudo ./make.sh ci-setup-deps
 
-    - name: Setup dependencies for target
-      run: ./make.sh ci-setup-deps-target
+    - name: Setup dependencies for user
+      run: ./make.sh ci-setup-user-deps
 
     - uses: Swatinem/rust-cache@v2
       with:

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -41,8 +41,8 @@ jobs:
     - name: Install dependencies
       run: ./make.sh ci-setup-deps
 
-    - name: Install dependencies for target
-      run: ./make.sh ci-setup-deps-target
+    - name: Setup dependencies for user
+      run: ./make.sh ci-setup-user-deps
 
     - uses: Swatinem/rust-cache@v2
       with:
@@ -71,9 +71,9 @@ jobs:
 
     - name: Setup dependencies
       run: ./make.sh ci-setup-deps
-
-    - name: Setup dependencies for target
-      run: ./make.sh ci-setup-deps-target
+    
+    - name: Setup dependencies for user
+      run: ./make.sh ci-setup-user-deps
 
     - uses: Swatinem/rust-cache@v2
       with:

diff --git a/contrib/dockerfiles/draft/aarch64-linux-gnu.dockerfile b/contrib/dockerfiles/draft/aarch64-linux-gnu.dockerfile
@@ -13,7 +13,7 @@ COPY ./make.sh .
 
 ENV PATH=/root/.cargo/bin:$PATH
 RUN ./make.sh ci-setup-deps
-RUN ./make.sh ci-setup-deps-target
+RUN ./make.sh ci-setup-user-deps
 
 COPY . .
 RUN ./make.sh build-deps

diff --git a/contrib/dockerfiles/draft/arm-linux-gnueabihf.dockerfile b/contrib/dockerfiles/draft/arm-linux-gnueabihf.dockerfile
@@ -13,7 +13,7 @@ COPY ./make.sh .
 
 ENV PATH=/root/.cargo/bin:$PATH
 RUN ./make.sh ci-setup-deps
-RUN ./make.sh ci-setup-deps-target
+RUN ./make.sh ci-setup-user-deps
 
 COPY . .
 RUN ./make.sh build-deps

diff --git a/contrib/dockerfiles/noarch.dockerfile b/contrib/dockerfiles/noarch.dockerfile
@@ -15,7 +15,7 @@ COPY ./make.sh .
 
 ENV PATH=/root/.cargo/bin:$PATH
 RUN ./make.sh ci-setup-deps
-RUN ./make.sh ci-setup-deps-target
+RUN ./make.sh ci-setup-user-deps
 
 COPY . .
 RUN ./make.sh build-deps

diff --git a/contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile b/contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile
@@ -13,7 +13,7 @@ COPY ./make.sh .
 
 ENV PATH=/root/.cargo/bin:$PATH
 RUN ./make.sh ci-setup-deps
-RUN ./make.sh ci-setup-deps-target
+RUN ./make.sh ci-setup-user-deps
 
 COPY . .
 RUN ./make.sh build-deps

diff --git a/make.sh b/make.sh
@@ -719,7 +719,7 @@ pkg_install_llvm() {
     _fold_end
 }
 
-pkg_install_rust() {
+pkg_user_install_rust() {
     _fold_start "pkg-install-rust"
     curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \
         --default-toolchain="${RUST_DEFAULT_VERSION}" -y
@@ -782,7 +782,7 @@ clean_pkg_local_py_deps() {
   _safe_rm_rf "${python_venv}"
 }
 
-pkg_setup_rust() {
+pkg_user_setup_rust() {
     local rust_target
     # shellcheck disable=SC2119
     rust_target=$(get_rust_triplet)
@@ -1111,10 +1111,10 @@ ci_setup_deps() {
     DEBIAN_FRONTEND=noninteractive pkg_install_deps
     DEBIAN_FRONTEND=noninteractive pkg_setup_locale
     DEBIAN_FRONTEND=noninteractive pkg_install_llvm
-    DEBIAN_FRONTEND=noninteractive pkg_install_rust
+    ci_setup_deps_target
 }
 
-_ci_setup_deps_target() {
+ci_setup_deps_target() {
     local target=${TARGET}
     case $target in
         # Nothing to do on host
@@ -1134,9 +1134,9 @@ _ci_setup_deps_target() {
     esac
 }
 
-ci_setup_deps_target() {
-    _ci_setup_deps_target
-    pkg_setup_rust
+ci_setup_user_deps() {
+    pkg_user_install_rust
+    pkg_user_setup_rust
 }
 
 # Public helpers