refactor: merge clients and servers in the same repo

Signed-off-by: Quentin Guidée <[email protected]>
vertex-center · Mar 3, 2024 · 0d9c08e · 0d9c08e
1 parent 2757879
commit 0d9c08e
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 19 deletions.
diff --git a/server/.github/ISSUE_TEMPLATE/config.yml → .github/ISSUE_TEMPLATE/config.yml b/server/.github/ISSUE_TEMPLATE/config.yml → .github/ISSUE_TEMPLATE/config.yml
diff --git a/...SUE_TEMPLATE/feature-or-change-request.md → ...SUE_TEMPLATE/feature-or-change-request.md b/...SUE_TEMPLATE/feature-or-change-request.md → ...SUE_TEMPLATE/feature-or-change-request.md
diff --git a/server/.github/ISSUE_TEMPLATE/issue-bug.yml → .github/ISSUE_TEMPLATE/issue-bug.yml b/server/.github/ISSUE_TEMPLATE/issue-bug.yml → .github/ISSUE_TEMPLATE/issue-bug.yml
diff --git a/server/.github/ISSUE_TEMPLATE/question.md → .github/ISSUE_TEMPLATE/question.md b/server/.github/ISSUE_TEMPLATE/question.md → .github/ISSUE_TEMPLATE/question.md
diff --git a/server/.github/actionlint-matcher.json → .github/actionlint-matcher.json b/server/.github/actionlint-matcher.json → .github/actionlint-matcher.json
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,8 +3,21 @@ updates:
   - package-ecosystem: "npm"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: weekly
     groups:
       node-dependencies:
         patterns:
           - "*"
+    labels:
+      - "type: Dependencies"
+
+  - package-ecosystem: gomod
+    directory: "server"
+    schedule:
+      interval: weekly
+    groups:
+      gomod-dependencies:
+        patterns:
+          - "*"
+    labels:
+      - "type: Dependencies"
diff --git a/.github/workflows/client-dev.yml b/.github/workflows/client-dev.yml
@@ -26,7 +26,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/${{ github.repository }}
+          images: ghcr.io/${{ github.repository_owner }}/client
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3

diff --git a/server/.github/workflows/workflow.yml → .github/workflows/server.yml b/server/.github/workflows/workflow.yml → .github/workflows/server.yml
@@ -5,6 +5,9 @@ on:
   push:
     branches:
       - main
+    paths:
+      - '.github/workflows/server.yml'
+      - 'server/**'
     tags:
       - "v*"
 
@@ -192,7 +195,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: server/docker/setup-buildx-action@v3
 
       - name: Setup metadata
         id: meta
@@ -213,7 +216,7 @@ jobs:
         with:
           push: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') }}
           context: .
-          file: docker/bundle.Dockerfile
+          file: server/docker/bundle.Dockerfile
           tags: ${{ steps.meta.outputs.tags }}
           platforms: linux/amd64,linux/arm64,linux/arm
           no-cache: true
@@ -268,7 +271,7 @@ jobs:
         with:
           push: ${{ github.ref == 'refs/heads/main' }}
           context: .
-          file: docker/micro.Dockerfile
+          file: server/docker/micro.Dockerfile
           tags: ${{ steps.meta.outputs.tags }}
           platforms: linux/amd64,linux/arm64,linux/arm
           no-cache: true

diff --git a/server/.golangci.yaml → .golangci.yaml b/server/.golangci.yaml → .golangci.yaml
diff --git a/server/.goreleaser.yaml → .goreleaser.yaml b/server/.goreleaser.yaml → .goreleaser.yaml
@@ -1,5 +1,6 @@
 builds:
   - main: ./cmd/kernel
+    dir: server
     id: "vertex-kernel"
     binary: vertex-kernel
     goos:
@@ -18,6 +19,7 @@ builds:
         goarch: "386"
 
   - main: ./cmd/main
+    dir: server
     id: "vertex"
     binary: vertex
     goos:

diff --git a/server/.github/dependabot.yml b/server/.github/dependabot.yml