From 0d9c08e923b36c832ecbe8d0a82f2fee116affb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Guid=C3=A9e?= Date: Sat, 2 Mar 2024 22:01:35 -0500 Subject: [PATCH] refactor: merge clients and servers in the same repo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Quentin Guidée --- .../.github => .github}/ISSUE_TEMPLATE/config.yml | 0 .../ISSUE_TEMPLATE/feature-or-change-request.md | 0 .../ISSUE_TEMPLATE/issue-bug.yml | 0 .../ISSUE_TEMPLATE/question.md | 0 .../.github => .github}/actionlint-matcher.json | 0 .github/dependabot.yml | 15 ++++++++++++++- .github/workflows/client-dev.yml | 2 +- .../workflow.yml => .github/workflows/server.yml | 9 ++++++--- server/.golangci.yaml => .golangci.yaml | 0 server/.goreleaser.yaml => .goreleaser.yaml | 2 ++ server/.github/dependabot.yml | 14 -------------- 11 files changed, 23 insertions(+), 19 deletions(-) rename {server/.github => .github}/ISSUE_TEMPLATE/config.yml (100%) rename {server/.github => .github}/ISSUE_TEMPLATE/feature-or-change-request.md (100%) rename {server/.github => .github}/ISSUE_TEMPLATE/issue-bug.yml (100%) rename {server/.github => .github}/ISSUE_TEMPLATE/question.md (100%) rename {server/.github => .github}/actionlint-matcher.json (100%) rename server/.github/workflows/workflow.yml => .github/workflows/server.yml (97%) rename server/.golangci.yaml => .golangci.yaml (100%) rename server/.goreleaser.yaml => .goreleaser.yaml (94%) delete mode 100644 server/.github/dependabot.yml diff --git a/server/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml similarity index 100% rename from server/.github/ISSUE_TEMPLATE/config.yml rename to .github/ISSUE_TEMPLATE/config.yml diff --git a/server/.github/ISSUE_TEMPLATE/feature-or-change-request.md b/.github/ISSUE_TEMPLATE/feature-or-change-request.md similarity index 100% rename from server/.github/ISSUE_TEMPLATE/feature-or-change-request.md rename to .github/ISSUE_TEMPLATE/feature-or-change-request.md diff --git a/server/.github/ISSUE_TEMPLATE/issue-bug.yml b/.github/ISSUE_TEMPLATE/issue-bug.yml similarity index 100% rename from server/.github/ISSUE_TEMPLATE/issue-bug.yml rename to .github/ISSUE_TEMPLATE/issue-bug.yml diff --git a/server/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md similarity index 100% rename from server/.github/ISSUE_TEMPLATE/question.md rename to .github/ISSUE_TEMPLATE/question.md diff --git a/server/.github/actionlint-matcher.json b/.github/actionlint-matcher.json similarity index 100% rename from server/.github/actionlint-matcher.json rename to .github/actionlint-matcher.json diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 342b3616..117ce952 100644 --- 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 index cdd6ae60..d24a690a 100644 --- 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 b/.github/workflows/server.yml similarity index 97% rename from server/.github/workflows/workflow.yml rename to .github/workflows/server.yml index e231788e..00e9d065 100644 --- a/server/.github/workflows/workflow.yml +++ b/.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 b/.golangci.yaml similarity index 100% rename from server/.golangci.yaml rename to .golangci.yaml diff --git a/server/.goreleaser.yaml b/.goreleaser.yaml similarity index 94% rename from server/.goreleaser.yaml rename to .goreleaser.yaml index 7a556848..d86ba7ca 100644 --- a/server/.goreleaser.yaml +++ b/.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 deleted file mode 100644 index bb8a2a1a..00000000 --- a/server/.github/dependabot.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: 2 - -updates: - - package-ecosystem: gomod - directory: "/" - schedule: - interval: daily - target-branch: main - groups: - main: - patterns: - - "*" - labels: - - "type: Dependencies"