Skip to content

Commit 6a2d00b

Browse files
authored
Merge pull request #451 from maximka76667/production
fix: testing-view small bug fixes
2 parents 2662374 + cc058d9 commit 6a2d00b

48 files changed

Lines changed: 602 additions & 219 deletions

Some content is hidden

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

.github/workflows/build.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,13 @@ jobs:
5353
competition-view: ${{ steps.filter.outputs.competition-view == 'true' || github.event.inputs.rebuild-competition-view == 'true' || inputs.build-competition-view == true }}
5454
steps:
5555
- uses: actions/checkout@v4
56+
with:
57+
fetch-depth: 0
5658

5759
- uses: dorny/paths-filter@v3
5860
id: filter
5961
with:
60-
ref: "production"
62+
base: ${{ github.event.before }}
6163
filters: |
6264
backend:
6365
- 'backend/**/*'
@@ -113,7 +115,7 @@ jobs:
113115
with:
114116
workflow: build.yaml
115117
branch: production
116-
workflow_conclusion: success
118+
workflow_conclusion: completed
117119
name: backend-${{ matrix.platform }}
118120
path: backend/cmd
119121

.github/workflows/frontend-tests.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,8 @@ jobs:
4141
- name: Install dependencies
4242
run: pnpm install --frozen-lockfile --filter=testing-view --filter=ui --filter=core
4343

44+
- name: Build frontend
45+
run: pnpm build --filter="./frontend/**"
46+
4447
- name: Run tests
4548
run: pnpm test --filter="./frontend/**"

.github/workflows/release.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,12 @@ jobs:
8686
echo "Updated version to:"
8787
cat package.json | grep version
8888
89+
- name: Install Linux build dependencies
90+
if: runner.os == 'Linux'
91+
run: |
92+
sudo apt-get update
93+
sudo apt-get install -y rpm libarchive-tools
94+
8995
# Download ONLY the appropriate backend for this platform
9096
- name: Download Linux backend
9197
if: runner.os == 'Linux'
@@ -182,6 +188,8 @@ jobs:
182188
electron-app/dist/*.exe
183189
electron-app/dist/*.AppImage
184190
electron-app/dist/*.deb
191+
electron-app/dist/*.rpm
192+
electron-app/dist/*.pacman
185193
electron-app/dist/*.dmg
186194
electron-app/dist/*.zip
187195
electron-app/dist/*.yml

backend/cmd/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import (
55
"os"
66
"os/signal"
77

8-
adj_module "github.com/HyperloopUPV-H8/h9-backend/internal/adj"
98
"github.com/HyperloopUPV-H8/h9-backend/internal/config"
109
"github.com/HyperloopUPV-H8/h9-backend/internal/flags"
1110
"github.com/HyperloopUPV-H8/h9-backend/internal/pod_data"
1211
"github.com/HyperloopUPV-H8/h9-backend/internal/update_factory"
1312
vehicle_models "github.com/HyperloopUPV-H8/h9-backend/internal/vehicle/models"
13+
adj_module "github.com/HyperloopUPV-H8/h9-backend/pkg/adj"
1414
"github.com/HyperloopUPV-H8/h9-backend/pkg/transport"
1515
"github.com/HyperloopUPV-H8/h9-backend/pkg/websocket"
1616
trace "github.com/rs/zerolog/log"

backend/cmd/orchestrator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"runtime/pprof"
88
"strings"
99

10-
adj_module "github.com/HyperloopUPV-H8/h9-backend/internal/adj"
1110
"github.com/HyperloopUPV-H8/h9-backend/internal/config"
1211
"github.com/HyperloopUPV-H8/h9-backend/internal/flags"
1312
"github.com/HyperloopUPV-H8/h9-backend/internal/pod_data"
1413
"github.com/HyperloopUPV-H8/h9-backend/pkg/abstraction"
14+
adj_module "github.com/HyperloopUPV-H8/h9-backend/pkg/adj"
1515
"github.com/HyperloopUPV-H8/h9-backend/pkg/logger"
1616
data_logger "github.com/HyperloopUPV-H8/h9-backend/pkg/logger/data"
1717
order_logger "github.com/HyperloopUPV-H8/h9-backend/pkg/logger/order"

backend/cmd/setup_transport.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import (
77
"net"
88
"time"
99

10-
adj_module "github.com/HyperloopUPV-H8/h9-backend/internal/adj"
1110
"github.com/HyperloopUPV-H8/h9-backend/internal/common"
1211
"github.com/HyperloopUPV-H8/h9-backend/internal/config"
1312
"github.com/HyperloopUPV-H8/h9-backend/internal/pod_data"
1413
"github.com/HyperloopUPV-H8/h9-backend/internal/utils"
1514
"github.com/HyperloopUPV-H8/h9-backend/pkg/abstraction"
15+
adj_module "github.com/HyperloopUPV-H8/h9-backend/pkg/adj"
1616
"github.com/HyperloopUPV-H8/h9-backend/pkg/transport"
1717
"github.com/HyperloopUPV-H8/h9-backend/pkg/transport/network/tcp"
1818
"github.com/HyperloopUPV-H8/h9-backend/pkg/transport/network/udp"

backend/cmd/setup_vehicle.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import (
1212
h "github.com/HyperloopUPV-H8/h9-backend/pkg/http"
1313
"github.com/HyperloopUPV-H8/h9-backend/pkg/websocket"
1414

15-
adj_module "github.com/HyperloopUPV-H8/h9-backend/internal/adj"
1615
"github.com/HyperloopUPV-H8/h9-backend/internal/common"
1716
"github.com/HyperloopUPV-H8/h9-backend/internal/config"
1817
"github.com/HyperloopUPV-H8/h9-backend/internal/pod_data"
1918
"github.com/HyperloopUPV-H8/h9-backend/internal/update_factory"
2019
"github.com/HyperloopUPV-H8/h9-backend/pkg/abstraction"
20+
adj_module "github.com/HyperloopUPV-H8/h9-backend/pkg/adj"
2121
"github.com/HyperloopUPV-H8/h9-backend/pkg/broker"
2222
connection_topic "github.com/HyperloopUPV-H8/h9-backend/pkg/broker/topics/connection"
2323
data_topic "github.com/HyperloopUPV-H8/h9-backend/pkg/broker/topics/data"

backend/internal/pod_data/measurement.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"strings"
66

7-
"github.com/HyperloopUPV-H8/h9-backend/internal/adj"
87
"github.com/HyperloopUPV-H8/h9-backend/internal/common"
98
"github.com/HyperloopUPV-H8/h9-backend/internal/utils"
9+
"github.com/HyperloopUPV-H8/h9-backend/pkg/adj"
1010
)
1111

1212
const EnumType = "enum"

backend/internal/pod_data/pod_data.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package pod_data
33
import (
44
"github.com/HyperloopUPV-H8/h9-backend/internal/utils"
55

6-
"github.com/HyperloopUPV-H8/h9-backend/internal/adj"
76
"github.com/HyperloopUPV-H8/h9-backend/internal/common"
7+
"github.com/HyperloopUPV-H8/h9-backend/pkg/adj"
88
)
99

1010
func NewPodData(adjBoards map[string]adj.Board, globalUnits map[string]utils.Operations) (PodData, error) {

electron-app/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ pnpm run dist:linux # Linux
7979
On macOS, the backend requires the loopback address `127.0.0.9` to be configured. If you encounter a "can't assign requested address" error when starting the backend, run:
8080

8181
```
82-
sudo ipconfig set en0 INFORM 127.0.0.9
82+
sudo ifconfig lo0 alias 127.0.0.9 up
8383
```
8484

8585
## Available Scripts
@@ -89,6 +89,7 @@ sudo ipconfig set en0 INFORM 127.0.0.9
8989
- `pnpm start` - Run application in development mode
9090
- `pnpm run dist` - Build production executable
9191
- `pnpm test` - Run tests
92+
- `pnpm build-icons` - build icon from the icon.png file in the `/electron-app` folder
9293
...and many custom variations (see package.json)
9394
9495
# Only works and makes sense after running `pnpm run dist`

0 commit comments

Comments
 (0)