From 50d1e23e54ad8fd5338660f108fc7a7910e0adf9 Mon Sep 17 00:00:00 2001 From: nacho Date: Fri, 10 May 2024 00:19:12 +0200 Subject: [PATCH 1/8] add --- .github/workflows/ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c804d6..b5a76d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,17 +13,16 @@ concurrency: jobs: test: name: +test - runs-on: ubuntu-latest + runs-on: [earthly-satellite#gha-lib] env: FORCE_COLOR: 1 EARTHLY_CONVERSION_PARALLELISM: "5" EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}" EARTHLY_INSTALL_ID: "earthly-lib-githubactions" steps: - - uses: earthly/actions/setup-earthly@v1 - uses: actions/checkout@v2 - name: Docker mirror login (non fork only) - run: docker login registry-1.docker.io.mirror.corp.earthly.dev --username "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" --password "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" + run: dockerd&;sleep 30;docker login registry-1.docker.io.mirror.corp.earthly.dev --username "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" --password "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository - name: Configure Earthly to use mirror (non fork only) run: |- @@ -36,7 +35,7 @@ jobs: earthly config git "{github.com: {auth: ssh, user: git}}" && \ eval $(ssh-agent) && \ earthly secrets --org earthly-technologies --project core get littleredcorvette-id_rsa | ssh-add - && \ - earthly --ci -P --org earthly-technologies --satellite lib +test + earthly --ci -P --org earthly-technologies +test test-native-arm: name: +test-native-arm runs-on: ubuntu-latest From cf322ede6bb1b7b1875eeb3933d987ec2f15c788 Mon Sep 17 00:00:00 2001 From: nacho Date: Fri, 10 May 2024 12:47:28 +0200 Subject: [PATCH 2/8] add --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b5a76d1..3278e7f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,12 +22,14 @@ jobs: steps: - uses: actions/checkout@v2 - name: Docker mirror login (non fork only) - run: dockerd&;sleep 30;docker login registry-1.docker.io.mirror.corp.earthly.dev --username "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" --password "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" + run: |- + dockerd&; + sleep 30; + docker login registry-1.docker.io.mirror.corp.earthly.dev --username "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" --password "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository - name: Configure Earthly to use mirror (non fork only) run: |- earthly config global.buildkit_additional_config "'[registry.\"docker.io\"] - mirrors = [\"registry-1.docker.io.mirror.corp.earthly.dev\"]'" if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository - name: Run tests From 7a022a05ef195ed92740fce8608c052dd0e29fcd Mon Sep 17 00:00:00 2001 From: nacho Date: Fri, 10 May 2024 12:52:29 +0200 Subject: [PATCH 3/8] add --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3278e7f..38ac39b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,8 +23,8 @@ jobs: - uses: actions/checkout@v2 - name: Docker mirror login (non fork only) run: |- - dockerd&; - sleep 30; + dockerd& + sleep 30 docker login registry-1.docker.io.mirror.corp.earthly.dev --username "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" --password "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository - name: Configure Earthly to use mirror (non fork only) From 7adef8f52ed8f66c484cf4841ad5ca889ff522d9 Mon Sep 17 00:00:00 2001 From: nacho Date: Fri, 10 May 2024 16:29:59 +0200 Subject: [PATCH 4/8] add --- .github/workflows/ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38ac39b..a6107a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,19 +38,22 @@ jobs: eval $(ssh-agent) && \ earthly secrets --org earthly-technologies --project core get littleredcorvette-id_rsa | ssh-add - && \ earthly --ci -P --org earthly-technologies +test + test-native-arm: name: +test-native-arm - runs-on: ubuntu-latest + runs-on: [earthly-satellite#gha-arm-lib] env: FORCE_COLOR: 1 EARTHLY_CONVERSION_PARALLELISM: "5" EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}" EARTHLY_INSTALL_ID: "earthly-lib-githubactions" steps: - - uses: earthly/actions/setup-earthly@v1 - uses: actions/checkout@v2 - name: Docker mirror login (non fork only) - run: docker login registry-1.docker.io.mirror.corp.earthly.dev --username "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" --password "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" + run: |- + dockerd& + sleep 30 + docker login registry-1.docker.io.mirror.corp.earthly.dev --username "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" --password "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository - name: Configure Earthly to use mirror (non fork only) run: |- From da26f41209ffb3726bd7f4f37a1fd8bc9d957153 Mon Sep 17 00:00:00 2001 From: nacho Date: Fri, 10 May 2024 20:59:23 +0200 Subject: [PATCH 5/8] add --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6107a4..44b9a25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: earthly config git "{github.com: {auth: ssh, user: git}}" && \ eval $(ssh-agent) && \ earthly secrets --org earthly-technologies --project core get littleredcorvette-id_rsa | ssh-add - && \ - earthly --ci -P --org earthly-technologies +test + earthly --ci -P +test test-native-arm: name: +test-native-arm @@ -66,4 +66,4 @@ jobs: earthly config git "{github.com: {auth: ssh, user: git}}" && \ eval $(ssh-agent) && \ earthly secrets --org earthly-technologies --project core get littleredcorvette-id_rsa | ssh-add - && \ - earthly --ci -P --org earthly-technologies --satellite lib-arm ./utils/dind+test + earthly --ci -P ./utils/dind+test From b0692a25c83572ee65a3798f2d0d31244347ae82 Mon Sep 17 00:00:00 2001 From: nacho Date: Wed, 15 May 2024 16:33:50 +0200 Subject: [PATCH 6/8] remove dockerd start --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44b9a25..7472bbf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,14 +51,11 @@ jobs: - uses: actions/checkout@v2 - name: Docker mirror login (non fork only) run: |- - dockerd& - sleep 30 docker login registry-1.docker.io.mirror.corp.earthly.dev --username "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" --password "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository - name: Configure Earthly to use mirror (non fork only) run: |- earthly config global.buildkit_additional_config "'[registry.\"docker.io\"] - mirrors = [\"registry-1.docker.io.mirror.corp.earthly.dev\"]'" if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository - name: Run tests From ae91a75332f6b8ed7b4bd7ed021fe64a51395536 Mon Sep 17 00:00:00 2001 From: nacho Date: Wed, 15 May 2024 16:42:45 +0200 Subject: [PATCH 7/8] remove dockerd start --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7472bbf..6802ac8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,8 +23,6 @@ jobs: - uses: actions/checkout@v2 - name: Docker mirror login (non fork only) run: |- - dockerd& - sleep 30 docker login registry-1.docker.io.mirror.corp.earthly.dev --username "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" --password "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository - name: Configure Earthly to use mirror (non fork only) From 89c64cb53aa7a462a475701f78f0d068396201e8 Mon Sep 17 00:00:00 2001 From: nacho Date: Wed, 15 May 2024 16:45:00 +0200 Subject: [PATCH 8/8] format code --- .github/workflows/ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6802ac8..7075244 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Docker mirror login (non fork only) - run: |- - docker login registry-1.docker.io.mirror.corp.earthly.dev --username "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" --password "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" + run: docker login registry-1.docker.io.mirror.corp.earthly.dev --username "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" --password "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository - name: Configure Earthly to use mirror (non fork only) run: |- @@ -48,8 +47,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Docker mirror login (non fork only) - run: |- - docker login registry-1.docker.io.mirror.corp.earthly.dev --username "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" --password "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" + run: docker login registry-1.docker.io.mirror.corp.earthly.dev --username "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" --password "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}" if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository - name: Configure Earthly to use mirror (non fork only) run: |-