Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .github/workflows/admin-orchestrator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@ name: Admin branch orchestration

on:
create:

push:
branches:
- "**"
- "main"

schedule:
- cron: "0 3 * * 1" # Weekly, Monday 03:00 UTC

workflow_dispatch:

pull_request:
Expand Down Expand Up @@ -59,8 +62,12 @@ jobs:
# Periodically rebase admin onto default (true rebase)
# ------------------------------------------------------------
- name: Rebase admin onto default
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'push'
run: |
set -e
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"

git fetch origin
git checkout admin

Expand Down
18 changes: 0 additions & 18 deletions .github/workflows/build.yml

This file was deleted.

51 changes: 51 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: CI

on:
push:
pull_request:

jobs:
# ------------------------------------------------------------
# Main build job
# ------------------------------------------------------------
build:
runs-on: ubuntu-latest
container: wpilib/roborio-cross-ubuntu:2024-22.04
if: ${{ github.event_name != 'pull_request' || github.event.pull_request == null }}

steps:
- name: Checkout repository
uses: actions/checkout@v6

- name: Mark repo as safe for git
run: git config --global --add safe.directory $GITHUB_WORKSPACE

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Set up Gradle cache
uses: gradle/actions/setup-gradle@v4

- name: Build robot code
run: ./gradlew build --no-daemon --parallel --build-cache

# ------------------------------------------------------------
# Spotless job (separate for branch protection)
# ------------------------------------------------------------
spotless:
runs-on: ubuntu-latest
container: wpilib/roborio-cross-ubuntu:2024-22.04
# Only run for PRs or pushes targeting main/develop
if: github.base_ref == 'main' || github.base_ref == 'develop' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop'
steps:
- name: Checkout repository
uses: actions/checkout@v6

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Set up Gradle cache
uses: gradle/actions/setup-gradle@v4

- name: Run Spotless check
run: ./gradlew spotlessCheck --no-daemon --parallel --build-cache
4 changes: 4 additions & 0 deletions .github/workflows/dependency-submission.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: Dependency Submission

# Purpose: Generate and submit Gradle dependency metadata (graph) to Gradle’s services.
# Trigger: Push to main branch only.
# Effect: Helps with dependency insight, conflict detection, and build analytics.

on:
push:
branches: [ 'main' ]
Expand Down
54 changes: 0 additions & 54 deletions .github/workflows/main.yml

This file was deleted.

2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pluginManagement {
repositories {
mavenLocal()
gradlePluginPortal()
String frcYear = '2025'
String frcYear = '2026beta'
File frcHome
if (OperatingSystem.current().isWindows()) {
String publicFolder = System.getenv('PUBLIC')
Expand Down
Loading