Merge remote-tracking branch 'upstream/dev' into codex/merge-nextlevelbuilder-goclaw

# Conflicts:
#	internal/pipeline/think_stage.go
#	internal/pipeline/tool_stage.go
#	tests/integration/git_adapter_ssh_test.go
This commit is contained in:
Goon committed 2026-06-09 22:38:32 +07:00
commit a63080714a
40 files changed
+2206 -263

No files matched your search

+37 -169
View File
@@ -161,94 +161,27 @@ jobs:
strategy:
fail-fast: false
matrix:
variant: [base, latest, full]
platform: [linux/amd64, linux/arm64]
include:
- variant: base
suffix: "-base"
enable_embedui: "false"
enable_python: "false"
enable_full_skills: "false"
- variant: latest
suffix: ""
enable_embedui: "true"
enable_python: "true"
enable_full_skills: "false"
- variant: full
suffix: "-full"
enable_embedui: "true"
enable_python: "true"
enable_full_skills: "true"
- platform: linux/amd64
runner: ubuntu-latest
arch: amd64
- platform: linux/arm64
runner: ubuntu-24.04-arm
arch: arm64
runs-on: ${{ matrix.runner }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: docker/setup-buildx-action@v3
- name: Log in to GHCR
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push by digest
id: build
uses: docker/build-push-action@v6
with:
context: .
platforms: ${{ matrix.platform }}
outputs: type=image,name=${{ env.GHCR_IMAGE }},push-by-digest=true,name-canonical=true,push=true
build-args: |
ENABLE_OTEL=false
ENABLE_EMBEDUI=${{ matrix.enable_embedui }}
ENABLE_PYTHON=${{ matrix.enable_python }}
ENABLE_FULL_SKILLS=${{ matrix.enable_full_skills }}
VERSION=v${{ needs.release.outputs.version }}
cache-from: type=gha,scope=${{ matrix.variant }}-${{ matrix.arch }}
cache-to: type=gha,mode=max,scope=${{ matrix.variant }}-${{ matrix.arch }}
provenance: false
- name: Export digest
run: |
mkdir -p /tmp/digests
digest="${{ steps.build.outputs.digest }}"
touch "/tmp/digests/${digest#sha256:}"
- uses: actions/upload-artifact@v4
with:
name: digests-${{ matrix.variant }}-${{ matrix.arch }}
path: /tmp/digests/*
if-no-files-found: error
retention-days: 1
# Combine per-platform digests into multi-arch manifests and push final tags
# to both GHCR and Docker Hub. One job per variant runs in parallel.
docker-merge:
needs: [release, docker-build]
if: needs.release.outputs.released == 'true'
runs-on: ubuntu-latest
timeout-minutes: 15
strategy:
fail-fast: false
matrix:
include:
- variant: base
suffix: "-base"
- variant: latest
suffix: ""
- variant: full
suffix: "-full"
steps:
- name: Download digests
uses: actions/download-artifact@v4
with:
path: /tmp/digests
pattern: digests-${{ matrix.variant }}-*
merge-multiple: true
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
@@ -277,92 +210,34 @@ jobs:
type=raw,value=latest,enable=${{ matrix.suffix == '' }},suffix=
type=raw,value=${{ matrix.variant }},enable=${{ matrix.suffix != '' }}
- name: Create manifest list and push
working-directory: /tmp/digests
run: |
# Compose -t flags from metadata-action tags (newline-separated)
TAG_ARGS=()
while IFS= read -r tag; do
[ -n "$tag" ] && TAG_ARGS+=("-t" "$tag")
done <<< "${{ steps.meta.outputs.tags }}"
# Compose source digest refs (pushed to GHCR by docker-build)
DIGEST_ARGS=()
for f in *; do
DIGEST_ARGS+=("${{ env.GHCR_IMAGE }}@sha256:$f")
done
set -x
docker buildx imagetools create "${TAG_ARGS[@]}" "${DIGEST_ARGS[@]}"
- name: Build and push
uses: docker/build-push-action@v6
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
ENABLE_OTEL=false
ENABLE_EMBEDUI=${{ matrix.enable_embedui }}
ENABLE_PYTHON=${{ matrix.enable_python }}
ENABLE_FULL_SKILLS=${{ matrix.enable_full_skills }}
VERSION=v${{ needs.release.outputs.version }}
cache-from: type=gha,scope=release-${{ matrix.variant }}
cache-to: type=gha,mode=max,scope=release-${{ matrix.variant }}
provenance: false
- name: Inspect manifest
run: |
docker buildx imagetools inspect \
"${{ env.GHCR_IMAGE }}:v${{ needs.release.outputs.version }}${{ matrix.suffix }}"
# Build web UI Docker image per platform on native runners.
# Build web UI Docker image.
docker-web-build:
needs: release
if: needs.release.outputs.released == 'true'
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
platform: [linux/amd64, linux/arm64]
include:
- platform: linux/amd64
runner: ubuntu-latest
arch: amd64
- platform: linux/arm64
runner: ubuntu-24.04-arm
arch: arm64
runs-on: ${{ matrix.runner }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: docker/setup-buildx-action@v3
- name: Log in to GHCR
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push by digest
id: build
uses: docker/build-push-action@v6
with:
context: ui/web
platforms: ${{ matrix.platform }}
outputs: type=image,name=${{ env.GHCR_IMAGE }}-web,push-by-digest=true,name-canonical=true,push=true
cache-from: type=gha,scope=web-${{ matrix.arch }}
cache-to: type=gha,mode=max,scope=web-${{ matrix.arch }}
provenance: false
- name: Export digest
run: |
mkdir -p /tmp/digests
digest="${{ steps.build.outputs.digest }}"
touch "/tmp/digests/${digest#sha256:}"
- uses: actions/upload-artifact@v4
with:
name: digests-web-${{ matrix.arch }}
path: /tmp/digests/*
if-no-files-found: error
retention-days: 1
docker-web-merge:
needs: [release, docker-web-build]
if: needs.release.outputs.released == 'true'
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
- name: Download digests
uses: actions/download-artifact@v4
with:
path: /tmp/digests
pattern: digests-web-*
merge-multiple: true
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
@@ -390,28 +265,21 @@ jobs:
type=raw,value=v${{ needs.release.outputs.version }}
type=raw,value=latest
- name: Create manifest list and push
working-directory: /tmp/digests
run: |
TAG_ARGS=()
while IFS= read -r tag; do
[ -n "$tag" ] && TAG_ARGS+=("-t" "$tag")
done <<< "${{ steps.meta.outputs.tags }}"
DIGEST_ARGS=()
for f in *; do
DIGEST_ARGS+=("${{ env.GHCR_IMAGE }}-web@sha256:$f")
done
set -x
docker buildx imagetools create "${TAG_ARGS[@]}" "${DIGEST_ARGS[@]}"
- name: Inspect manifest
run: |
docker buildx imagetools inspect \
"${{ env.GHCR_IMAGE }}-web:v${{ needs.release.outputs.version }}"
- name: Build and push
uses: docker/build-push-action@v6
with:
context: ui/web
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha,scope=release-web
cache-to: type=gha,mode=max,scope=release-web
provenance: false
# Notify Discord on new release (runs even if docker jobs fail)
notify-discord:
needs: [release, build-binaries, docker-merge, docker-web-merge]
needs: [release, build-binaries, docker-build, docker-web-build]
if: always() && needs.release.outputs.released == 'true' && !cancelled()
runs-on: ubuntu-latest
timeout-minutes: 5