Merge pull request #38 from fc92/refactor

move backend to dedicated folder
fc92 · Aug 21, 2023 · 29619a8 · 29619a8
2 parents 5341d02 + 20c32ba
commit 29619a8
Show file tree

Hide file tree

Showing 27 changed files with 10 additions and 29 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -73,7 +73,7 @@ jobs:
         uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5
         with:
           context: .
-          file: build/package/Dockerfile
+          file: backend/build/package/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -105,23 +105,3 @@ jobs:
         # This step uses the identity token to provision an ephemeral certificate
         # against the sigstore community Fulcio instance.
         run: echo "${{ steps.meta.outputs.tags }}" | xargs -I {} cosign sign {}@${{ steps.build-and-push.outputs.digest }}
-
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Configure Git
-        run: |
-          git config user.name "$GITHUB_ACTOR"
-          git config user.email "[email protected]"
-
-      - name: Run chart-releaser
-        uses: helm/[email protected]
-        with:
-          charts_dir: deployments/poker
-        env:
-          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -35,9 +35,11 @@ jobs:
           go-version: 1.21.0
 
       - name: Build
+        working-directory: backend
         run: go build -v -o poker cmd/poker.go
 
       - name: Run coverage
+        working-directory: backend
         run: go test -race -coverprofile=coverage.out -covermode=atomic ./...
 
       - name: Upload coverage reports to Codecov with GitHub Action

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -29,7 +29,7 @@ jobs:
           goos: ${{ matrix.goos }}
           goarch: ${{ matrix.goarch }}
           goversion: "https://dl.google.com/go/go1.21.0.linux-amd64.tar.gz"
-          project_path: "./cmd"
+          project_path: "backend/cmd"
           binary_name: "poker"
           extra_files: LICENSE README.md
           retry: 10

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -3,7 +3,7 @@
 This page provide technical information to facilitate future maintenance of the project.
 
 - [Contributing](#contributing)
-  - [Building from sources](#building-from-sources)
+  - [Building backend from sources](#building-backend-from-sources)
   - [Deployments methods](#deployments-methods)
     - [Use CLI in console mode](#use-cli-in-console-mode)
     - [Deploy the game for Web based access](#deploy-the-game-for-web-based-access)
@@ -14,18 +14,18 @@ This page provide technical information to facilitate future maintenance of the
     - [Low level design](#low-level-design)
   - [Debug log](#debug-log)
 
-## Building from sources
+## Building backend from sources
 
 Prerequisites:
 
 - internet access
-- recent go version (tested with 1.19.x and 1.20)
+- recent go version (tested with 1.19.x to 1.21)
 
 Get the sources and build the `poker` binary:
 
 ```bash
 git clone https://github.com/fc92/poker
-cd poker
+cd poker/backend
 go build -o poker cmd/poker.go
 ```
 
@@ -44,7 +44,6 @@ The are different ways of deploying this client/server game:
 
 - using CLI in console mode (recommended for development or native client on a wide range of platforms),
 - with Web based access for better user experience (recommended for end users),
-- with Web based access to a Kubernetes cluster (adds support for multiple poker rooms for different teams)
 
 ### Use CLI in console mode
 

diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
 build:
-	docker build -t poker:latest -f build/package/Dockerfile .
+	docker build -t poker:latest -f backend/build/package/Dockerfile .
 
 build-debug:
-	docker build -t poker:debug -f build/package/debug/Dockerfile .
+	docker build -t poker:debug -f backend/build/package/debug/Dockerfile .
 
 all: build build-debug
 

diff --git a/build/package/Dockerfile → backend/build/package/Dockerfile b/build/package/Dockerfile → backend/build/package/Dockerfile
diff --git a/build/package/clients.sh → backend/build/package/clients.sh b/build/package/clients.sh → backend/build/package/clients.sh
diff --git a/build/package/debug/Dockerfile → backend/build/package/debug/Dockerfile b/build/package/debug/Dockerfile → backend/build/package/debug/Dockerfile
diff --git a/build/package/debug/clients-debug.sh → backend/build/package/debug/clients-debug.sh b/build/package/debug/clients-debug.sh → backend/build/package/debug/clients-debug.sh
diff --git a/build/package/poker.sh → backend/build/package/poker.sh b/build/package/poker.sh → backend/build/package/poker.sh
diff --git a/cmd/poker.go → backend/cmd/poker.go b/cmd/poker.go → backend/cmd/poker.go
diff --git a/go.mod → backend/go.mod b/go.mod → backend/go.mod
diff --git a/go.sum → backend/go.sum b/go.sum → backend/go.sum
diff --git a/internal/common/logger/logger.go → backend/internal/common/logger/logger.go b/internal/common/logger/logger.go → backend/internal/common/logger/logger.go
diff --git a/internal/common/logger/logger_test.go → ...end/internal/common/logger/logger_test.go b/internal/common/logger/logger_test.go → ...end/internal/common/logger/logger_test.go
diff --git a/internal/common/participant.go → backend/internal/common/participant.go b/internal/common/participant.go → backend/internal/common/participant.go
diff --git a/internal/common/participant_test.go → backend/internal/common/participant_test.go b/internal/common/participant_test.go → backend/internal/common/participant_test.go
diff --git a/internal/common/room.go → backend/internal/common/room.go b/internal/common/room.go → backend/internal/common/room.go
diff --git a/internal/common/room_test.go → backend/internal/common/room_test.go b/internal/common/room_test.go → backend/internal/common/room_test.go
diff --git a/internal/player/console/textview.go → backend/internal/player/console/textview.go b/internal/player/console/textview.go → backend/internal/player/console/textview.go
diff --git a/internal/player/player.go → backend/internal/player/player.go b/internal/player/player.go → backend/internal/player/player.go
diff --git a/internal/server/client.go → backend/internal/server/client.go b/internal/server/client.go → backend/internal/server/client.go
diff --git a/internal/server/hub.go → backend/internal/server/hub.go b/internal/server/hub.go → backend/internal/server/hub.go
diff --git a/internal/server/hub_test.go → backend/internal/server/hub_test.go b/internal/server/hub_test.go → backend/internal/server/hub_test.go
diff --git a/internal/server/websocket.go → backend/internal/server/websocket.go b/internal/server/websocket.go → backend/internal/server/websocket.go
diff --git a/internal/server/websocket_test.go → backend/internal/server/websocket_test.go b/internal/server/websocket_test.go → backend/internal/server/websocket_test.go
diff --git a/backend/poker b/backend/poker