Merge pull request #1 from mrf345/testing

Fix module name and pipeline
mrf345 · Aug 29, 2024 · b28a976 · b28a976
2 parents 22d5b6c + 657d56b
commit b28a976
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 36 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,42 +3,46 @@ name: Build
 on: [push]
 
 jobs:
-  build:
+  backend-build:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         go: [stable]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.22'
+          cache-dependency-path: go.sum
+      - name: Install dependencies
+        run: go get .
+      - name: Lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.59
+      - name: Test
+        run: go test -count=2 ./...
 
-    jobs:
-      Backend:
-        steps:
-          - uses: actions/checkout@v4
-          - uses: actions/setup-go@v5
-            with:
-              go-version: '1.22'
-              cache-dependency-path: |
-                 go.sum
-          - name: Install dependencies
-            run: go get .
-          - name: Lint
-            uses: golangci/golangci-lint-action@v6
-            with:
-              version: v1.59
-          - name: Test backend
-            run: go test -count=2 ./...
-
-      Frontend:
-        steps:
-          - uses: actions/checkout@v4
-          - uses: actions/setup-node@v4
-            with:
-              node-version: '20.8.0'
-              cache: 'npm'
-              cache-dependency-path: frontend/package-lock.json
-          - name: Install dependencies
-            run: npm --prefix frontend i
-          - name: Lint
-            run: npm --prefix frontend run lint
-          - name: Test
-            run: npm --prefix frontend test
+  frontend-build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        go: [stable]
+    defaults:
+      run:
+        working-directory: ./frontend
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20.8.0'
+          cache: 'npm'
+          cache-dependency-path: frontend/package-lock.json
+      - name: Install dependencies
+        run: npm i
+      - name: Lint
+        run: npm run lint
+      - name: Test
+        run: npm test
diff --git a/frontend/dist/.ignoreme b/frontend/dist/.ignoreme
diff --git a/go.mod b/go.mod
@@ -1,9 +1,7 @@
-module goodstuff
+module safelock
 
 go 1.22
 
-toolchain go1.23.0
-
 require (
 	github.com/google/uuid v1.3.0
 	github.com/mrf345/desktop-entry v0.0.3