From e8de4a366c27572df443ef6b5c7a50513d111222 Mon Sep 17 00:00:00 2001 From: Demian Parkhomenko <95881717+DemianParkhomenko@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:49:12 +0200 Subject: [PATCH 1/2] Uncomment the deploy job in .github/workflows/dev.yml --- .github/workflows/dev.yml | 21 ++++++++++----------- package-lock.json | 3 +++ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index a37da7d..49b6d9f 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -44,14 +44,13 @@ jobs: - run: npm run prettier:check - run: npm run eslint:check - run: npm run test - # TODO: Add deploy job - # deploy: - # runs-on: ubuntu-latest - # needs: [test, analyze] - # if: github.ref == 'refs/heads/main' - # steps: - # - uses: actions/checkout@v3 - # - uses: superfly/flyctl-actions/setup-flyctl@master - # - run: flyctl deploy --remote-only - # env: - # FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} + deploy: + runs-on: ubuntu-latest + needs: [test, analyze] + # if: github.ref == 'refs/heads/main' + steps: + - uses: actions/checkout@v3 + - uses: superfly/flyctl-actions/setup-flyctl@master + - run: flyctl deploy --remote-only + env: + FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} diff --git a/package-lock.json b/package-lock.json index df449e1..6071da3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,6 +25,9 @@ "lint-staged": "^14.0.1", "prettier": "3.0.3", "typescript": "^5.2.2" + }, + "engines": { + "node": "18 || 20" } }, "node_modules/@aashutoshrathi/word-wrap": { From 2e2f04afbb745d0cb9bbc8b66601864ef14f403b Mon Sep 17 00:00:00 2001 From: Demian Parkhomenko <95881717+DemianParkhomenko@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:57:13 +0200 Subject: [PATCH 2/2] Deploy only on main branch --- .github/workflows/dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 49b6d9f..3cc9a43 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -47,7 +47,7 @@ jobs: deploy: runs-on: ubuntu-latest needs: [test, analyze] - # if: github.ref == 'refs/heads/main' + if: github.ref == 'refs/heads/main' steps: - uses: actions/checkout@v3 - uses: superfly/flyctl-actions/setup-flyctl@master