MayaTheShy/Starworld
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge main branch and resolve CI workflow conflict

Browse Source 
Co-authored-by: MayaTheShy <117858929+MayaTheShy@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2025-11-17 00:11:43 +00:00
parent 3e2c03c5dc
commit fcfd60b6e5
2 changed files with 141 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View File

@@ -2,9 +2,9 @@ name: CI
on: on:
push: push:
branches: [ main, dev ] branches: [main, dev]
pull_request: pull_request:
branches: [ main ] branches: [main]
jobs: jobs:
build-and-test: build-and-test:
@@ -13,8 +13,6 @@ jobs:
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
submodules: recursive
- name: Install system dependencies - name: Install system dependencies
run: | run: |

4
.github/workflows/rust-quality.yml vendored
View File

@@ -2,12 +2,12 @@ name: Rust Quality Checks
on: on:
push: push:
branches: [ main, dev ] branches: [main, dev]
paths: paths:
- 'bridge/**' - 'bridge/**'
- '.github/workflows/rust-quality.yml' - '.github/workflows/rust-quality.yml'
pull_request: pull_request:
branches: [ main ] branches: [main]
paths: paths:
- 'bridge/**' - 'bridge/**'