Skip to content

Commit 32ccfeb

Browse files
authored
Merge branch 'main' into 377-setup-database-migrations
2 parents 1ae2673 + af1939f commit 32ccfeb

File tree

194 files changed

+111941
-2524
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+111941
-2524
lines changed
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: Frontend Build
1+
name: Frontend Test
22
on: [push, pull_request]
33

44
jobs:
5-
build:
5+
build-and-test:
66
runs-on: ubuntu-latest
77

88
strategy:
@@ -20,7 +20,8 @@ jobs:
2020
run: |
2121
cd ./gs/frontend/${{ matrix.project }}
2222
npm ci
23-
- name: Build ${{ matrix.project }}
23+
- name: Build and test ${{ matrix.project }}
2424
run: |
2525
cd ./gs/frontend/${{ matrix.project }}
2626
npm run build
27+
npm run test
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: Auto Milestone Management
2+
on:
3+
pull_request:
4+
branches:
5+
- main
6+
types:
7+
- closed
8+
9+
permissions:
10+
issues: write
11+
pull-requests: write
12+
13+
jobs:
14+
add-milestone:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Add milestone on PR merge
18+
if: github.event.pull_request.merged == true
19+
uses: actions/github-script@v8
20+
with:
21+
script: |
22+
const date = new Date();
23+
const month = date.getMonth() + 1;
24+
const year = date.getFullYear();
25+
const yy = String(year % 100);
26+
27+
let term;
28+
if (month <= 4) term = "W";
29+
else if (month >= 9) term = "F";
30+
else term = "S";
31+
32+
const format = yy + term;
33+
34+
const { data: milestones } = await github.rest.issues.listMilestones({
35+
owner: context.repo.owner,
36+
repo: context.repo.repo,
37+
state: "open"
38+
});
39+
40+
let milestone = null;
41+
for (let i = 0; i < milestones.length; i++) {
42+
if (milestones[i].title == format) {
43+
milestone = milestones[i];
44+
break;
45+
}
46+
}
47+
48+
if (!milestone) {
49+
const { data: new_milestone } = await github.rest.issues.createMilestone({
50+
owner: context.repo.owner,
51+
repo: context.repo.repo,
52+
title: format
53+
});
54+
milestone = new_milestone;
55+
}
56+
57+
await github.rest.issues.update({
58+
owner: context.repo.owner,
59+
repo: context.repo.repo,
60+
issue_number: context.payload.pull_request.number,
61+
milestone: milestone.number
62+
});

.github/workflows/pr_stats.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
with:
1212
token: ${{ secrets.ADD_A_PERSONAL_ACCESS_TOKEN }}
1313
period: 120
14-
chats: true
14+
charts: true
1515
disable-links: false
1616
sort-by: 'REVIEWS'
1717
organization: 'UWOrbital'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ compile_commands.json
6464
*.sw?
6565

6666
.env
67+
.*.env
6768
*.db
6869

6970
/build*

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repos:
99
- id: end-of-file-fixer
1010
exclude: '((libs|hal)/.*|\.(ts|tsx|css|html|json|md|yaml|yml|ipynb)$)'
1111
- id: check-added-large-files
12-
exclude: "(libs|hal)/.*"
12+
exclude: "(libs|hal)/.*|gs/backend/data/resources/callsigns\\.csv$"
1313
- repo: https://github.com/pre-commit/mirrors-clang-format
1414
rev: v17.0.6
1515
hooks:

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ if(${CMAKE_BUILD_TYPE} MATCHES OBC)
88
endif()
99
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchain_arm_none_eabi.cmake)
1010
elseif(${CMAKE_BUILD_TYPE} MATCHES GS)
11-
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchain_ground_station_gcc.cmake)
11+
if(NOT APPLE)
12+
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchain_ground_station_gcc.cmake)
13+
endif()
1214
elseif(${CMAKE_BUILD_TYPE} MATCHES HIL)
1315
include(${CMAKE_SOURCE_DIR}/cmake/fetch_googletest.cmake)
1416
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchain_hil_gcc.cmake)

0 commit comments

Comments
 (0)