diff --git a/.github/workflows/auto_pr_review.yaml b/.github/workflows/auto_pr_review.yaml index b9664b9066..977460f5bc 100644 --- a/.github/workflows/auto_pr_review.yaml +++ b/.github/workflows/auto_pr_review.yaml @@ -29,11 +29,11 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - target: /^(?!master$).*/ + target: /^(?!master-tici$).*/ exclude: /sunnypilot:.*/ change-to: ${{ github.base_ref }} already-exists-action: close_this - already-exists-comment: "Your PR should be made against the `master` branch" + already-exists-comment: "Your PR should be made against the `master-tici` branch" update-pr-labels: name: Update fork's PR Labels diff --git a/.github/workflows/badges.yaml b/.github/workflows/badges.yaml index 3019ba9cba..12d534968e 100644 --- a/.github/workflows/badges.yaml +++ b/.github/workflows/badges.yaml @@ -5,7 +5,7 @@ on: workflow_dispatch: env: - BASE_IMAGE: sunnypilot-base + BASE_IMAGE: sunnypilot-tici-base DOCKER_REGISTRY: ghcr.io/sunnypilot RUN: docker run --shm-size 2G -v $PWD:/tmp/openpilot -w /tmp/openpilot -e PYTHONPATH=/tmp/openpilot -e NUM_JOBS -e JOB_ID -e GITHUB_ACTION -e GITHUB_REF -e GITHUB_HEAD_REF -e GITHUB_SHA -e GITHUB_REPOSITORY -e GITHUB_RUN_ID -v $GITHUB_WORKSPACE/.ci_cache/scons_cache:/tmp/scons_cache -v $GITHUB_WORKSPACE/.ci_cache/comma_download_cache:/tmp/comma_download_cache -v $GITHUB_WORKSPACE/.ci_cache/openpilot_cache:/tmp/openpilot_cache $DOCKER_REGISTRY/$BASE_IMAGE:latest /bin/bash -c diff --git a/.github/workflows/cereal_validation.yaml b/.github/workflows/cereal_validation.yaml index 2290481c56..307e47cea3 100644 --- a/.github/workflows/cereal_validation.yaml +++ b/.github/workflows/cereal_validation.yaml @@ -3,7 +3,7 @@ name: cereal validation on: push: branches: - - master + - master-tici pull_request: paths: - 'cereal/**' @@ -16,7 +16,7 @@ on: type: string concurrency: - group: cereal-validation-ci-run-${{ inputs.run_number }}-${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && github.run_id || github.head_ref || github.ref }}-${{ github.workflow }}-${{ github.event_name }} + group: cereal-validation-ci-run-${{ inputs.run_number }}-${{ github.event_name == 'push' && github.ref == 'refs/heads/master-tici' && github.run_id || github.head_ref || github.ref }}-${{ github.workflow }}-${{ github.event_name }} cancel-in-progress: true env: diff --git a/.github/workflows/ci_weekly_report.yaml b/.github/workflows/ci_weekly_report.yaml index b96a5a56a8..bf80568dbf 100644 --- a/.github/workflows/ci_weekly_report.yaml +++ b/.github/workflows/ci_weekly_report.yaml @@ -31,7 +31,7 @@ jobs: strategy: fail-fast: false matrix: ${{fromJSON(needs.setup.outputs.ci_runs)}} - uses: sunnypilot/sunnypilot/.github/workflows/ci_weekly_run.yaml@master + uses: sunnypilot/sunnypilot/.github/workflows/ci_weekly_run.yaml@master-tici with: run_number: ${{ matrix.run_number }} diff --git a/.github/workflows/ci_weekly_run.yaml b/.github/workflows/ci_weekly_run.yaml index a2a8ab31a2..b89f578721 100644 --- a/.github/workflows/ci_weekly_run.yaml +++ b/.github/workflows/ci_weekly_run.yaml @@ -12,6 +12,6 @@ concurrency: jobs: selfdrive_tests: - uses: sunnypilot/sunnypilot/.github/workflows/selfdrive_tests.yaml@master + uses: sunnypilot/sunnypilot/.github/workflows/selfdrive_tests.yaml@master-tici with: run_number: ${{ inputs.run_number }} diff --git a/.github/workflows/compile-openpilot/action.yaml b/.github/workflows/compile-openpilot/action.yaml index 4015746c0e..091f507991 100644 --- a/.github/workflows/compile-openpilot/action.yaml +++ b/.github/workflows/compile-openpilot/action.yaml @@ -15,7 +15,7 @@ runs: scons -j$(nproc) --cache-populate" - name: Save scons cache uses: actions/cache/save@v4 - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/master-tici' with: path: .ci_cache/scons_cache key: scons-${{ runner.arch }}-${{ env.CACHE_COMMIT_DATE }}-${{ github.sha }} diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index ce225034d9..e8c211c04f 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -3,7 +3,7 @@ name: docs on: push: branches: - - master + - master-tici pull_request: workflow_call: inputs: @@ -12,7 +12,7 @@ on: required: true type: string concurrency: - group: docs-tests-ci-run-${{ inputs.run_number }}-${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && github.run_id || github.head_ref || github.ref }}-${{ github.workflow }}-${{ github.event_name }} + group: docs-tests-ci-run-${{ inputs.run_number }}-${{ github.event_name == 'push' && github.ref == 'refs/heads/master-tici' && github.run_id || github.head_ref || github.ref }}-${{ github.workflow }}-${{ github.event_name }} cancel-in-progress: true jobs: @@ -35,13 +35,13 @@ jobs: # Push to docs.comma.ai - uses: actions/checkout@v4 - if: github.ref == 'refs/heads/master' && github.repository == 'sunnypilot/sunnypilot' + if: github.ref == 'refs/heads/master-tici' && github.repository == 'sunnypilot/sunnypilot' with: path: openpilot-docs ssh-key: ${{ secrets.OPENPILOT_DOCS_KEY }} repository: sunnypilot/sunnypilot-docs - name: Push - if: github.ref == 'refs/heads/master' && github.repository == 'sunnypilot/sunnypilot' + if: github.ref == 'refs/heads/master-tici' && github.repository == 'sunnypilot/sunnypilot' run: | set -x diff --git a/.github/workflows/prebuilt.yaml b/.github/workflows/prebuilt.yaml index dde290d5c5..6aac331e9f 100644 --- a/.github/workflows/prebuilt.yaml +++ b/.github/workflows/prebuilt.yaml @@ -24,11 +24,11 @@ jobs: if: ${{ github.event_name != 'workflow_dispatch' }} uses: lewagon/wait-on-check-action@ccfb013c15c8afb7bf2b7c028fb74dc5a068cccc with: - ref: master + ref: master-tici wait-interval: 30 running-workflow-name: 'build prebuilt' repo-token: ${{ secrets.GITHUB_TOKEN }} - check-regexp: ^((?!.*(build master-ci).*).)*$ + check-regexp: ^((?!.*(build __nightly).*).)*$ - uses: actions/checkout@v4 with: submodules: true diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index c072e98e24..58b742a40c 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -19,6 +19,7 @@ jobs: contents: write pull-requests: write runs-on: ubuntu-latest + if: False steps: - uses: release-drafter/release-drafter@v6 with: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b9303045d0..a88b6b8734 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,7 +10,7 @@ jobs: env: ImageOS: ubuntu24 container: - image: ghcr.io/sunnypilot/sunnypilot-base:latest + image: ghcr.io/sunnypilot/sunnypilot-tici-base:latest runs-on: ubuntu-latest if: github.repository == 'sunnypilot/sunnypilot' permissions: @@ -25,7 +25,7 @@ jobs: if: ${{ github.event_name == 'schedule' }} uses: lewagon/wait-on-check-action@ccfb013c15c8afb7bf2b7c028fb74dc5a068cccc with: - ref: master + ref: master-tici wait-interval: 30 running-workflow-name: 'build __nightly' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/repo-maintenance.yaml b/.github/workflows/repo-maintenance.yaml index 49dae93747..4663d5101b 100644 --- a/.github/workflows/repo-maintenance.yaml +++ b/.github/workflows/repo-maintenance.yaml @@ -6,7 +6,7 @@ on: workflow_dispatch: env: - BASE_IMAGE: sunnypilot-base + BASE_IMAGE: sunnypilot-tici-base BUILD: release/ci/docker_build_sp.sh base RUN: docker run --shm-size 2G -v $PWD:/tmp/openpilot -w /tmp/openpilot -e CI=1 -e PYTHONWARNINGS=error -e FILEREADER_CACHE=1 -e PYTHONPATH=/tmp/openpilot -e NUM_JOBS -e JOB_ID -e GITHUB_ACTION -e GITHUB_REF -e GITHUB_HEAD_REF -e GITHUB_SHA -e GITHUB_REPOSITORY -e GITHUB_RUN_ID -v $GITHUB_WORKSPACE/.ci_cache/scons_cache:/tmp/scons_cache -v $GITHUB_WORKSPACE/.ci_cache/comma_download_cache:/tmp/comma_download_cache -v $GITHUB_WORKSPACE/.ci_cache/openpilot_cache:/tmp/openpilot_cache $BASE_IMAGE /bin/bash -c @@ -28,7 +28,7 @@ jobs: title: "[bot] Update translations" body: "Automatic PR from repo-maintenance -> update_translations" branch: "update-translations" - base: "master" + base: "master-tici" delete-branch: true labels: bot @@ -36,7 +36,7 @@ jobs: name: package_updates runs-on: ubuntu-latest container: - image: ghcr.io/sunnypilot/sunnypilot-base:latest + image: ghcr.io/sunnypilot/sunnypilot-tici-base:latest if: github.repository == 'sunnypilot/sunnypilot' steps: - uses: actions/checkout@v4 @@ -68,7 +68,7 @@ jobs: commit-message: Update Python packages title: '[bot] Update Python packages' branch: auto-package-updates - base: master + base: master-tici delete-branch: true body: 'Automatic PR from repo-maintenance -> package_updates' labels: bot diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index 640ef3d01a..97bcc61783 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -3,7 +3,7 @@ name: selfdrive on: push: branches: - - master + - master-tici pull_request: workflow_dispatch: workflow_call: @@ -14,12 +14,12 @@ on: type: string concurrency: - group: selfdrive-tests-ci-run-${{ inputs.run_number }}-${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && github.run_id || github.head_ref || github.ref }}-${{ github.workflow }}-${{ github.event_name }} + group: selfdrive-tests-ci-run-${{ inputs.run_number }}-${{ github.event_name == 'push' && github.ref == 'refs/heads/master-tici' && github.run_id || github.head_ref || github.ref }}-${{ github.workflow }}-${{ github.event_name }} cancel-in-progress: true env: PYTHONWARNINGS: error - BASE_IMAGE: sunnypilot-base + BASE_IMAGE: sunnypilot-tici-base AZURE_TOKEN: ${{ secrets.AZURE_COMMADATACI_OPENPILOTCI_TOKEN }} DOCKER_LOGIN: docker login ghcr.io -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }} @@ -68,10 +68,10 @@ jobs: if: github.repository == 'sunnypilot/sunnypilot' timeout-minutes: 3 run: | - if [ "${{ github.ref }}" != "refs/heads/master" ]; then - git fetch origin master:refs/remotes/origin/master + if [ "${{ github.ref }}" != "refs/heads/master-tici" ]; then + git fetch origin master-tici:refs/remotes/origin/master-tici - SUBMODULE_PATHS=$(git diff origin/master HEAD --name-only | grep -E '^[^/]+$' | while read path; do + SUBMODULE_PATHS=$(git diff origin/master-tici HEAD --name-only | grep -E '^[^/]+$' | while read path; do if git ls-files --stage "$path" | grep -q "^160000"; then echo "$path" fi @@ -97,7 +97,7 @@ jobs: with: submodules: true - name: Setup docker push - if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'sunnypilot/sunnypilot' + if: github.ref == 'refs/heads/master-tici' && github.event_name != 'pull_request' && github.repository == 'sunnypilot/sunnypilot' run: | echo "PUSH_IMAGE=true" >> "$GITHUB_ENV" $DOCKER_LOGIN @@ -129,7 +129,7 @@ jobs: PYTHONWARNINGS: default - name: Save Homebrew cache uses: actions/cache/save@v4 - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/master-tici' with: path: ~/Library/Caches/Homebrew key: brew-macos-${{ env.CACHE_COMMIT_DATE }}-${{ github.sha }} @@ -146,7 +146,7 @@ jobs: run: . .venv/bin/activate && scons -j$(nproc) - name: Save scons cache uses: actions/cache/save@v4 - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/master-tici' with: path: /tmp/scons_cache key: scons-${{ runner.arch }}-macos-${{ env.CACHE_COMMIT_DATE }}-${{ github.sha }} @@ -305,5 +305,5 @@ jobs: - name: Upload Test Report uses: actions/upload-artifact@v4 with: - name: report-${{ inputs.run_number || '1' }}-${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && 'master' || github.event.number }} + name: report-${{ inputs.run_number || '1' }}-${{ github.event_name == 'push' && github.ref == 'refs/heads/master-tici' && 'master-tici' || github.event.number }} path: selfdrive/ui/tests/test_ui/report_1/screenshots diff --git a/.github/workflows/sunnypilot-build-model.yaml b/.github/workflows/sunnypilot-build-model.yaml index dfe84e7853..e207d1a886 100644 --- a/.github/workflows/sunnypilot-build-model.yaml +++ b/.github/workflows/sunnypilot-build-model.yaml @@ -14,7 +14,7 @@ on: upstream_branch: description: 'Upstream branch to build from' required: true - default: 'master' + default: 'master-tici' type: string custom_name: description: 'Custom name for the model (no date, only name)' @@ -35,7 +35,7 @@ on: upstream_branch: description: 'Upstream branch to build from' required: true - default: 'master' + default: 'master-tici' type: string custom_name: description: 'Custom name for the model (no date, only name)' diff --git a/.github/workflows/sunnypilot-build-prebuilt.yaml b/.github/workflows/sunnypilot-build-prebuilt.yaml index d654f5ab46..81b89ce88b 100644 --- a/.github/workflows/sunnypilot-build-prebuilt.yaml +++ b/.github/workflows/sunnypilot-build-prebuilt.yaml @@ -8,14 +8,14 @@ env: PUBLIC_REPO_URL: "https://github.com/sunnypilot/sunnypilot" # Branch configurations - STAGING_C3_SOURCE_BRANCH: ${{ vars.STAGING_C3_SOURCE_BRANCH || 'master' }} # vars are set on repo settings. + STAGING_C3_SOURCE_BRANCH: ${{ vars.STAGING_C3_SOURCE_BRANCH || 'master-tici' }} # vars are set on repo settings. # Runtime configuration SOURCE_BRANCH: "${{ github.head_ref || github.ref_name }}" on: push: - branches: [ master, master-dev-c3-new ] + branches: [ master-tici ] tags: [ 'release/*' ] pull_request_target: types: [ labeled ] diff --git a/.github/workflows/sunnypilot-master-dev-c3-prep.yaml b/.github/workflows/sunnypilot-master-dev-c3-prep.yaml index d4c201824e..bbf02a71f4 100644 --- a/.github/workflows/sunnypilot-master-dev-c3-prep.yaml +++ b/.github/workflows/sunnypilot-master-dev-c3-prep.yaml @@ -1,7 +1,7 @@ name: Build dev-c3-new env: - DEFAULT_SOURCE_BRANCH: "master" + DEFAULT_SOURCE_BRANCH: "master-tici" DEFAULT_TARGET_BRANCH: "master-dev-c3-new" PR_LABEL: "dev-c3" LFS_URL: 'https://gitlab.com/sunnypilot/public/sunnypilot-new-lfs.git/info/lfs' @@ -10,17 +10,17 @@ env: on: push: branches: - - master + - master-tici pull_request_target: types: [ labeled ] branches: - - 'master' + - 'master-tici' workflow_dispatch: inputs: source_branch: description: 'Source branch to reset from' required: true - default: 'master' + default: 'master-tici' type: string target_branch: description: 'Target branch to reset and squash into' @@ -40,11 +40,7 @@ concurrency: jobs: reset-and-squash: runs-on: ubuntu-latest - if: ( - (github.event_name == 'workflow_dispatch') - || (github.event_name == 'push' && github.ref == format('refs/heads/{0}', github.event.repository.default_branch)) - || (contains(github.event_name, 'pull_request') && ((github.event.action == 'labeled' && (github.event.label.name == 'dev-c3' || github.event.label.name == 'trust-fork-pr') && contains(github.event.pull_request.labels.*.name, 'dev-c3')))) - ) + if: False steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/ui_preview.yaml b/.github/workflows/ui_preview.yaml index 334b289632..00d93f5596 100644 --- a/.github/workflows/ui_preview.yaml +++ b/.github/workflows/ui_preview.yaml @@ -2,19 +2,19 @@ name: "ui preview" on: push: branches: - - master + - master-tici pull_request_target: types: [assigned, opened, synchronize, reopened, edited] branches: - - 'master' + - 'master-tici' paths: - 'selfdrive/ui/**' workflow_dispatch: env: UI_JOB_NAME: "Create UI Report" - REPORT_NAME: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && 'master' || github.event.number }} - SHA: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && github.sha || github.event.pull_request.head.sha }} + REPORT_NAME: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master-tici' && 'master-tici' || github.event.number }} + SHA: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master-tici' && github.sha || github.event.pull_request.head.sha }} BRANCH_NAME: "openpilot/pr-${{ github.event.number }}" jobs: @@ -55,7 +55,7 @@ jobs: name: report-1-${{ env.REPORT_NAME }} path: ${{ github.workspace }}/pr_ui - - name: Getting master ui + - name: Getting master-tici ui uses: actions/checkout@v4 with: repository: sunnypilot/ci-artifacts @@ -63,8 +63,8 @@ jobs: path: ${{ github.workspace }}/master_ui ref: openpilot_master_ui - - name: Saving new master ui - if: github.ref == 'refs/heads/master' && github.event_name == 'push' + - name: Saving new master-tici ui + if: github.ref == 'refs/heads/master-tici' && github.event_name == 'push' working-directory: ${{ github.workspace }}/master_ui run: | git checkout --orphan=new_master_ui @@ -93,9 +93,9 @@ jobs: for ((i=0; i<${#A[*]}; i=i+1)); do - # Check if the master file exists + # Check if the master-tici file exists if [ ! -f "${{ github.workspace }}/master_ui/${A[$i]}.png" ]; then - # This is a new file in PR UI that doesn't exist in master + # This is a new file in PR UI that doesn't exist in master-tici DIFF="${DIFF}
" DIFF="${DIFF}${A[$i]} : \$\${\\color{cyan}\\text{NEW}}\$\$" DIFF="${DIFF}" @@ -118,7 +118,7 @@ jobs: DIFF="${DIFF}
" DIFF="${DIFF}" - DIFF="${DIFF} " + DIFF="${DIFF} " DIFF="${DIFF} " DIFF="${DIFF}" diff --git a/Dockerfile.sunnypilot b/Dockerfile.sunnypilot index 88a226ad08..99fbef459c 100644 --- a/Dockerfile.sunnypilot +++ b/Dockerfile.sunnypilot @@ -1,4 +1,4 @@ -FROM ghcr.io/sunnypilot/sunnypilot-base:latest +FROM ghcr.io/sunnypilot/sunnypilot-tici-base:latest ENV PYTHONUNBUFFERED=1 diff --git a/release/ci/docker_common_sp.sh b/release/ci/docker_common_sp.sh index e8f515762a..097e5737f4 100755 --- a/release/ci/docker_common_sp.sh +++ b/release/ci/docker_common_sp.sh @@ -1,8 +1,8 @@ if [ "$1" = "base" ]; then - export DOCKER_IMAGE=sunnypilot-base + export DOCKER_IMAGE=sunnypilot-tici-base export DOCKER_FILE=Dockerfile.sunnypilot_base elif [ "$1" = "prebuilt" ]; then - export DOCKER_IMAGE=sunnypilot-prebuilt + export DOCKER_IMAGE=sunnypilot-tici-prebuilt export DOCKER_FILE=Dockerfile.sunnypilot else echo "Invalid docker build image: '$1'"
master master-tici proposed