Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into docs-0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
alexcb committed Nov 28, 2023
2 parents 83c9e8a + 5e0f1ab commit d13dfe1
Show file tree
Hide file tree
Showing 200 changed files with 6,882 additions and 2,817 deletions.
2 changes: 1 addition & 1 deletion .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
'release/**',
],
enabledManagers: [
'regex',
'custom.regex',
'github-actions',
],
customManagers: [
Expand Down
36 changes: 32 additions & 4 deletions .github/workflows/ci-docker-satellites.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ jobs:
EARTHLY_ORG: "earthly-technologies"
secrets: inherit

docker-tests-no-qemu-quick:
docker-tests-no-qemu-group1:
needs: build-earthly
uses: ./.github/workflows/reusable-test.yml
with:
TEST_TARGET: "+test-no-qemu-quick"
TEST_TARGET: "+test-no-qemu-group1"
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
RUNS_ON: "ubuntu-latest"
BINARY: "docker"
Expand All @@ -74,11 +74,39 @@ jobs:
EARTHLY_ORG: "earthly-technologies"
secrets: inherit

docker-tests-no-qemu-normal:
docker-tests-no-qemu-group2:
needs: build-earthly
uses: ./.github/workflows/reusable-test.yml
with:
TEST_TARGET: "+test-no-qemu-normal"
TEST_TARGET: "+test-no-qemu-group2"
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
RUNS_ON: "ubuntu-latest"
BINARY: "docker"
SUDO: ""
USE_SATELLITE: true
SATELLITE_NAME: "core-test"
EARTHLY_ORG: "earthly-technologies"
secrets: inherit

docker-tests-no-qemu-group3:
needs: build-earthly
uses: ./.github/workflows/reusable-test.yml
with:
TEST_TARGET: "+test-no-qemu-group3"
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
RUNS_ON: "ubuntu-latest"
BINARY: "docker"
SUDO: ""
USE_SATELLITE: true
SATELLITE_NAME: "core-test"
EARTHLY_ORG: "earthly-technologies"
secrets: inherit

docker-tests-no-qemu-group4:
needs: build-earthly
uses: ./.github/workflows/reusable-test.yml
with:
TEST_TARGET: "+test-no-qemu-group4"
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
RUNS_ON: "ubuntu-latest"
BINARY: "docker"
Expand Down
140 changes: 124 additions & 16 deletions .github/workflows/ci-docker-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,25 +66,79 @@ jobs:
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
secrets: inherit

docker-tests-no-qemu-quick:
docker-tests-no-qemu-group1:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-test.yml
with:
TEST_TARGET: "+test-no-qemu-quick"
TEST_TARGET: "+test-no-qemu-group1"
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
RUNS_ON: "ubuntu-latest"
BINARY: "docker"
SUDO: ""
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
secrets: inherit

docker-tests-no-qemu-quick-no-logbus:
docker-tests-no-qemu-group2:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-test.yml
with:
TEST_TARGET: "+test-no-qemu-quick"
TEST_TARGET: "+test-no-qemu-group2"
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
RUNS_ON: "ubuntu-latest"
BINARY: "docker"
SUDO: ""
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
secrets: inherit

docker-tests-no-qemu-group1-no-logbus:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-test.yml
with:
TEST_TARGET: "+test-no-qemu-group1"
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
RUNS_ON: "ubuntu-latest"
BINARY: "docker"
SUDO: ""
EXTRA_ARGS: "--logstream=false --logstream-upload=false"
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
secrets: inherit

docker-tests-no-qemu-group2-no-logbus:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-test.yml
with:
TEST_TARGET: "+test-no-qemu-group2"
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
RUNS_ON: "ubuntu-latest"
BINARY: "docker"
SUDO: ""
EXTRA_ARGS: "--logstream=false --logstream-upload=false"
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
secrets: inherit

docker-tests-no-qemu-group3:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-test.yml
with:
TEST_TARGET: "+test-no-qemu-group3"
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
RUNS_ON: "ubuntu-latest"
BINARY: "docker"
SUDO: ""
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
secrets: inherit

docker-tests-no-qemu-group3-no-logbus:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-test.yml
with:
TEST_TARGET: "+test-no-qemu-group3"
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
RUNS_ON: "ubuntu-latest"
BINARY: "docker"
Expand All @@ -93,25 +147,25 @@ jobs:
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
secrets: inherit

docker-tests-no-qemu-normal:
docker-tests-no-qemu-group4:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-test.yml
with:
TEST_TARGET: "+test-no-qemu-normal"
TEST_TARGET: "+test-no-qemu-group4"
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
RUNS_ON: "ubuntu-latest"
BINARY: "docker"
SUDO: ""
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
secrets: inherit

docker-tests-no-qemu-normal-no-logbus:
docker-tests-no-qemu-group4-no-logbus:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-test.yml
with:
TEST_TARGET: "+test-no-qemu-normal"
TEST_TARGET: "+test-no-qemu-group4"
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
RUNS_ON: "ubuntu-latest"
BINARY: "docker"
Expand Down Expand Up @@ -358,7 +412,7 @@ jobs:
TARGET_NAME: "+test-quick"
secrets: inherit

docker-wait-block-no-qemu-quick:
docker-wait-block-no-qemu-group1:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-wait-block-target.yml
Expand All @@ -368,10 +422,10 @@ jobs:
BINARY: "docker"
SUDO: ""
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
TARGET_NAME: "+test-no-qemu-quick"
TARGET_NAME: "+test-no-qemu-group1"
secrets: inherit

docker-wait-block-no-qemu-normal:
docker-wait-block-no-qemu-group2:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-wait-block-target.yml
Expand All @@ -381,7 +435,33 @@ jobs:
BINARY: "docker"
SUDO: ""
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
TARGET_NAME: "+test-no-qemu-normal"
TARGET_NAME: "+test-no-qemu-group2"
secrets: inherit

docker-wait-block-no-qemu-group3:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-wait-block-target.yml
with:
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
RUNS_ON: "ubuntu-latest"
BINARY: "docker"
SUDO: ""
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
TARGET_NAME: "+test-no-qemu-group3"
secrets: inherit

docker-wait-block-no-qemu-group4:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-wait-block-target.yml
with:
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
RUNS_ON: "ubuntu-latest"
BINARY: "docker"
SUDO: ""
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
TARGET_NAME: "+test-no-qemu-group4"
secrets: inherit

docker-wait-block-no-qemu-slow:
Expand Down Expand Up @@ -436,27 +516,55 @@ jobs:
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
secrets: inherit

race-tests-no-qemu-quick:
race-tests-no-qemu-group1:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-race-test.yml
with:
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
TEST_TARGET: "+test-no-qemu-group1"
RUNS_ON: "ubuntu-latest"
USE_QEMU: false
BINARY: "docker"
SUDO: ""
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
secrets: inherit

race-tests-no-qemu-group2:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-race-test.yml
with:
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
TEST_TARGET: "+test-no-qemu-group2"
RUNS_ON: "ubuntu-latest"
USE_QEMU: false
BINARY: "docker"
SUDO: ""
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
secrets: inherit

race-tests-no-qemu-group3:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-race-test.yml
with:
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
TEST_TARGET: "+test-no-qemu-quick"
TEST_TARGET: "+test-no-qemu-group3"
RUNS_ON: "ubuntu-latest"
USE_QEMU: false
BINARY: "docker"
SUDO: ""
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
secrets: inherit

race-tests-no-qemu-normal:
race-tests-no-qemu-group4:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-race-test.yml
with:
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
TEST_TARGET: "+test-no-qemu-normal"
TEST_TARGET: "+test-no-qemu-group4"
RUNS_ON: "ubuntu-latest"
USE_QEMU: false
BINARY: "docker"
Expand Down
34 changes: 30 additions & 4 deletions .github/workflows/ci-podman-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,25 +66,51 @@ jobs:
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
secrets: inherit

podman-tests-no-qemu-quick:
podman-tests-no-qemu-group1:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-test.yml
with:
TEST_TARGET: "+test-no-qemu-quick"
TEST_TARGET: "+test-no-qemu-group1"
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
RUNS_ON: "ubuntu-latest"
BINARY: "podman"
SUDO: "sudo -E"
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
secrets: inherit

podman-tests-no-qemu-normal:
podman-tests-no-qemu-group2:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-test.yml
with:
TEST_TARGET: "+test-no-qemu-normal"
TEST_TARGET: "+test-no-qemu-group2"
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
RUNS_ON: "ubuntu-latest"
BINARY: "podman"
SUDO: "sudo -E"
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
secrets: inherit

podman-tests-no-qemu-group3:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-test.yml
with:
TEST_TARGET: "+test-no-qemu-group3"
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
RUNS_ON: "ubuntu-latest"
BINARY: "podman"
SUDO: "sudo -E"
SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
secrets: inherit

podman-tests-no-qemu-group4:
needs: build-earthly
if: ${{ !failure() }}
uses: ./.github/workflows/reusable-test.yml
with:
TEST_TARGET: "+test-no-qemu-group4"
BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
RUNS_ON: "ubuntu-latest"
BINARY: "podman"
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/ci-scheduled-codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Install Go
uses: actions/setup-go@v4
with:
go-version-file: go.mod

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand All @@ -54,11 +59,11 @@ jobs:
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality


# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
Expand All @@ -67,12 +72,12 @@ jobs:
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh
# go version
# go build ./cmd/earthly/*.go

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
2 changes: 1 addition & 1 deletion .github/workflows/release-merge-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ jobs:
- name: Execute merge
# currently this is just in dry-run mode Add --push to the earthly command
# to get it out of dry run mode
run: earthly --ci +merge-main-to-docs
run: earthly --push --ci +merge-main-to-docs
Loading

0 comments on commit d13dfe1

Please sign in to comment.