From 783680569a948ac17890d5cd565d074cabd5e731 Mon Sep 17 00:00:00 2001 From: Mirko Mollik Date: Thu, 23 May 2024 21:26:02 +0200 Subject: [PATCH] Fix/ci (#38) * fix: ci Signed-off-by: Mirko Mollik * fix: ci Signed-off-by: Mirko Mollik * fix: add correct docker login Signed-off-by: Mirko Mollik * fix: add github token Signed-off-by: Mirko Mollik --------- Signed-off-by: Mirko Mollik --- .github/workflows/cd.yml | 9 +++++++++ .github/workflows/ci.yml | 5 ++--- nx.json | 5 ++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 72b39ebb..373bb8b5 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -28,6 +28,15 @@ jobs: node-version: 20 cache: 'pnpm' - run: pnpm install --frozen-lockfile + - uses: nrwl/nx-set-shas@v4 + + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Build and push images run: INPUT_GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} INPUT_PUSH=true pnpm exec nx affected -t container diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 72faee4d..3dcacd48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,6 @@ jobs: cache: 'pnpm' - run: pnpm install --frozen-lockfile - uses: nrwl/nx-set-shas@v4 + - run: git branch --track main origin/main - name: Lint, test, build, and container - env: - INPUT_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: pnpm exec nx affected -t lint test build container + run: INPUT_GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} pnpm exec nx affected -t lint test container diff --git a/nx.json b/nx.json index 6a17bfd6..d5ad3c10 100644 --- a/nx.json +++ b/nx.json @@ -12,7 +12,10 @@ "!{projectRoot}/src/test-setup.[jt]s", "!{projectRoot}/test-setup.[jt]s" ], - "sharedGlobals": [] + "sharedGlobals": [ + "{workspaceRoot}/.github/workflows/ci.yml", + "{workspaceRoot}/.github/workflows/cd.yml" + ] }, "workspaceLayout": { "appsDir": "apps", "libsDir": "libs" }, "nxCloudAccessToken": "NjQ2NjhiMWUtYjA1Ni00NTRjLWJjMjctMjkzNzA1NmRkMTgxfHJlYWQ=",