IDX GitHub Automation

dfinity · Sep 3, 2024 · 9e253e8 · 9e253e8
1 parent cb96191
commit 9e253e8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 115 deletions.
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
@@ -51,15 +51,11 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
       - name: Login to Dockerhub
         shell: bash
-        run: ./gitlab-ci/src/ci-scripts/docker-login.sh
->>>>>>> master
+        run: ./ci/scripts/docker-login.sh
         env:
           DOCKER_HUB_USER: ${{ vars.DOCKER_HUB_USER }}
           DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
@@ -123,14 +119,8 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-        env:
-          DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
->>>>>>> master
       - name: Run bazel build --config=check //rs/...
         id: bazel-build-config-check
         uses: ./.github/actions/bazel-test-all/
@@ -171,11 +161,7 @@ jobs:
           echo "$HOME/.cargo/bin:" >> $GITHUB_PATH
       - name: Login to Dockerhub
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-=======
-        run: ./gitlab-ci/src/ci-scripts/docker-login.sh
->>>>>>> master
+        run: ./ci/scripts/docker-login.sh
         env:
           DOCKER_HUB_USER: ${{ vars.DOCKER_HUB_USER }}
           DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
@@ -224,14 +210,8 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-        env:
-          DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
->>>>>>> master
       - name: Run Bazel Build Fuzzers
         id: bazel-build-fuzzers
         uses: ./.github/actions/bazel-test-all/
@@ -267,14 +247,8 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-        env:
-          DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
->>>>>>> master
       - name: Run Bazel Build Fuzzers AFL
         id: bazel-build-fuzzers-afl
         uses: ./.github/actions/bazel-test-all/
@@ -338,14 +312,8 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-        env:
-          DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
->>>>>>> master
       - name: Run Build IC
         id: build-ic
         shell: bash

diff --git a/.github/workflows/ci-pr-only.yml b/.github/workflows/ci-pr-only.yml
@@ -31,14 +31,8 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-        env:
-          DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
->>>>>>> master
       - name: Filter Relevant Files
         uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3
         id: filter
@@ -85,14 +79,8 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-        env:
-          DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
->>>>>>> master
       - name: Filter Relevant Files
         uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3
         id: filter
@@ -158,14 +146,8 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-        env:
-          DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
->>>>>>> master
       - name: Setup python deps
         id: setup-python-deps
         shell: bash

diff --git a/.github/workflows/release-testing.yml b/.github/workflows/release-testing.yml
@@ -93,15 +93,11 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
       - name: Login to Dockerhub
         shell: bash
-        run: ./gitlab-ci/src/ci-scripts/docker-login.sh
->>>>>>> master
+        run: ./ci/scripts/docker-login.sh
         env:
           DOCKER_HUB_USER: ${{ vars.DOCKER_HUB_USER }}
           DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
@@ -143,15 +139,11 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
       - name: Login to Dockerhub
         shell: bash
-        run: ./gitlab-ci/src/ci-scripts/docker-login.sh
->>>>>>> master
+        run: ./ci/scripts/docker-login.sh
         env:
           DOCKER_HUB_USER: ${{ vars.DOCKER_HUB_USER }}
           DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
@@ -201,15 +193,11 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
       - name: Login to Dockerhub
         shell: bash
-        run: ./gitlab-ci/src/ci-scripts/docker-login.sh
->>>>>>> master
+        run: ./ci/scripts/docker-login.sh
         env:
           DOCKER_HUB_USER: ${{ vars.DOCKER_HUB_USER }}
           DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}

diff --git a/.github/workflows/schedule-daily.yml b/.github/workflows/schedule-daily.yml
@@ -59,14 +59,8 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-        env:
-          DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
->>>>>>> master
       - name: Run Rust Benchmarks
         id: rust-benchmarks
         shell: bash
@@ -95,15 +89,11 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
       - name: Login to Dockerhub
         shell: bash
-        run: ./gitlab-ci/src/ci-scripts/docker-login.sh
->>>>>>> master
+        run: ./ci/scripts/docker-login.sh
         env:
           DOCKER_HUB_USER: ${{ vars.DOCKER_HUB_USER }}
           DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
@@ -142,15 +132,11 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
       - name: Login to Dockerhub
         shell: bash
-        run: ./gitlab-ci/src/ci-scripts/docker-login.sh
->>>>>>> master
+        run: ./ci/scripts/docker-login.sh
         env:
           DOCKER_HUB_USER: ${{ vars.DOCKER_HUB_USER }}
           DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
@@ -191,15 +177,11 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
       - name: Login to Dockerhub
         shell: bash
-        run: ./gitlab-ci/src/ci-scripts/docker-login.sh
->>>>>>> master
+        run: ./ci/scripts/docker-login.sh
         env:
           DOCKER_HUB_USER: ${{ vars.DOCKER_HUB_USER }}
           DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
@@ -240,15 +222,11 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
       - name: Login to Dockerhub
         shell: bash
-        run: ./gitlab-ci/src/ci-scripts/docker-login.sh
->>>>>>> master
+        run: ./ci/scripts/docker-login.sh
         env:
           DOCKER_HUB_USER: ${{ vars.DOCKER_HUB_USER }}
           DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
@@ -306,14 +284,8 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-        env:
-          DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
->>>>>>> master
       - name: Setup environment deps
         id: setup-environment-deps
         shell: bash

diff --git a/.github/workflows/schedule-hourly.yml b/.github/workflows/schedule-hourly.yml
@@ -32,15 +32,11 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
       - name: Login to Dockerhub
         shell: bash
-        run: ./gitlab-ci/src/ci-scripts/docker-login.sh
->>>>>>> master
+        run: ./ci/scripts/docker-login.sh
         env:
           DOCKER_HUB_USER: ${{ vars.DOCKER_HUB_USER }}
           DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
@@ -75,15 +71,11 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
       - name: Login to Dockerhub
         shell: bash
-        run: ./gitlab-ci/src/ci-scripts/docker-login.sh
->>>>>>> master
+        run: ./ci/scripts/docker-login.sh
         env:
           DOCKER_HUB_USER: ${{ vars.DOCKER_HUB_USER }}
           DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
@@ -122,14 +114,8 @@ jobs:
       - name: Before script
         id: before-script
         shell: bash
-<<<<<<< HEAD
-        run: ./ci/scripts/before-script.sh
-        env:
-          DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
-=======
         run: |
           [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
->>>>>>> master
       - name: Run Bazel Test Coverage
         shell: bash
         run: |