From 552588adf1050976eaed17098762294b9ca6dc9f Mon Sep 17 00:00:00 2001 From: bunkerity Date: Fri, 12 Aug 2022 16:39:00 +0200 Subject: [PATCH] temp disable arm --- .github/workflows/dev.yml | 102 +++++++++++++++++++------------------- examples/cors/tests.json | 2 +- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index b9f12e75f..13d2efae0 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -103,60 +103,60 @@ jobs: cache-to: type=registry,ref=bunkerity/cache:bw-ui-386-cache,mode=min # Build bunkerweb/arm - build-bw-arm: - runs-on: ubuntu-latest - steps: + # build-bw-arm: + # runs-on: ubuntu-latest + # steps: # Prepare - - name: Checkout source code - uses: actions/checkout@v3 - - name: Setup Buildx - id: buildx - uses: docker/setup-buildx-action@v2 - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_TOKEN }} - - name: Setup SSH for ARM node - run: | - mkdir -p ~/.ssh - echo "$SSH_KEY" > ~/.ssh/id_rsa_arm - chmod 600 ~/.ssh/id_rsa_arm - echo "$SSH_CONFIG" > ~/.ssh/config - env: - SSH_KEY: ${{ secrets.ARM_SSH_KEY }} - SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }} - - name: Append ARM node to buildx - run: | - docker buildx create --append --name ${{ steps.buildx.outputs.name }} --node arm --platform linux/arm64,linux/arm/v7,linux/arm/v6 ssh://ubuntu@arm + # - name: Checkout source code + # uses: actions/checkout@v3 + # - name: Setup Buildx + # id: buildx + # uses: docker/setup-buildx-action@v2 + # - name: Login to Docker Hub + # uses: docker/login-action@v2 + # with: + # username: ${{ secrets.DOCKER_USERNAME }} + # password: ${{ secrets.DOCKER_TOKEN }} + # - name: Setup SSH for ARM node + # run: | + # mkdir -p ~/.ssh + # echo "$SSH_KEY" > ~/.ssh/id_rsa_arm + # chmod 600 ~/.ssh/id_rsa_arm + # echo "$SSH_CONFIG" > ~/.ssh/config + # env: + # SSH_KEY: ${{ secrets.ARM_SSH_KEY }} + # SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }} + # - name: Append ARM node to buildx + # run: | + # docker buildx create --append --name ${{ steps.buildx.outputs.name }} --node arm --platform linux/arm64,linux/arm/v7,linux/arm/v6 ssh://ubuntu@arm # Build images - - name: Build BW for ARM - uses: docker/build-push-action@v3 - with: - context: . - platforms: linux/arm64,linux/arm/v7 - tags: bunkerweb-tests-arm:latest - cache-from: type=registry,ref=bunkerity/cache:bw-arm-cache - cache-to: type=registry,ref=bunkerity/cache:bw-arm-cache,mode=min - - name: Build BW autoconf for ARM - uses: docker/build-push-action@v3 - with: - context: . - file: autoconf/Dockerfile - platforms: linux/arm64,linux/arm/v7 - tags: bunkerweb-autoconf-tests-arm:latest - cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-arm-cache - cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-arm-cache,mode=min - - name: Build BW UI for ARM - uses: docker/build-push-action@v3 - with: - context: . - file: ui/Dockerfile - platforms: linux/arm64,linux/arm/v7 - tags: bunkerweb-ui-tests-arm:latest - cache-from: type=registry,ref=bunkerity/cache:bw-ui-arm-cache - cache-to: type=registry,ref=bunkerity/cache:bw-ui-arm-cache,mode=min + # - name: Build BW for ARM + # uses: docker/build-push-action@v3 + # with: + # context: . + # platforms: linux/arm64,linux/arm/v7 + # tags: bunkerweb-tests-arm:latest + # cache-from: type=registry,ref=bunkerity/cache:bw-arm-cache + # cache-to: type=registry,ref=bunkerity/cache:bw-arm-cache,mode=min + # - name: Build BW autoconf for ARM + # uses: docker/build-push-action@v3 + # with: + # context: . + # file: autoconf/Dockerfile + # platforms: linux/arm64,linux/arm/v7 + # tags: bunkerweb-autoconf-tests-arm:latest + # cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-arm-cache + # cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-arm-cache,mode=min + # - name: Build BW UI for ARM + # uses: docker/build-push-action@v3 + # with: + # context: . + # file: ui/Dockerfile + # platforms: linux/arm64,linux/arm/v7 + # tags: bunkerweb-ui-tests-arm:latest + # cache-from: type=registry,ref=bunkerity/cache:bw-ui-arm-cache + # cache-to: type=registry,ref=bunkerity/cache:bw-ui-arm-cache,mode=min # Build linux ubuntu build-bw-ubuntu: diff --git a/examples/cors/tests.json b/examples/cors/tests.json index 839d23f9c..46df669ba 100644 --- a/examples/cors/tests.json +++ b/examples/cors/tests.json @@ -5,7 +5,7 @@ "autoconf", "linux" ], - "timeout": 60, + "timeout": 6000, "tests": [ { "type": "string",