From 39aa2c44458d4bacf71171102f54b9eaa27eedbb Mon Sep 17 00:00:00 2001 From: ereti <43418802+ereti@users.noreply.github.com> Date: Thu, 1 Dec 2022 21:15:29 +0000 Subject: [PATCH] fix: github actions --- .github/workflows/bot.yml | 6 ------ .github/workflows/common.yml | 22 +++++++++------------- .github/workflows/database-seeds.yml | 25 +++++++++---------------- .github/workflows/github-bot.yml | 6 ------ .github/workflows/server.yml | 7 ++----- 5 files changed, 20 insertions(+), 46 deletions(-) diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index 4c3b0381e..c6cb43025 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -12,9 +12,6 @@ on: jobs: docker-push: runs-on: ubuntu-latest - defaults: - run: - working-directory: ./bot steps: - name: Checkout uses: actions/checkout@v3 @@ -46,9 +43,6 @@ jobs: run: echo ${{ steps.docker_build.outputs.digest }} deploy: runs-on: ubuntu-latest - defaults: - run: - working-directory: ./bot needs: [docker-push] steps: - name: Deploy diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index 85e329adc..98bced3da 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -12,25 +12,21 @@ on: jobs: deploy: runs-on: ubuntu-latest - defaults: - run: - working-directory: ./common steps: - name: Checkout uses: actions/checkout@v2 - - name: Install Node.js 16 - uses: actions/setup-node@v2 + - uses: pnpm/action-setup@v2 with: - node-version: 16.x + version: latest - - name: Install PNPM - uses: pnpm/action-setup@v2.0.1 + - uses: actions/setup-node@v3 with: - version: 6.0.2 - - - name: Install Dependencies - run: pnpm i + node-version: 16 + cache: pnpm + + - name: Install dependencies + run: pnpm --filter tachi-common... --filter . install - name: Run Tests - run: pnpm test + run: pnpm --filter tachi-common test diff --git a/.github/workflows/database-seeds.yml b/.github/workflows/database-seeds.yml index f526baed2..55dab1e3f 100644 --- a/.github/workflows/database-seeds.yml +++ b/.github/workflows/database-seeds.yml @@ -20,28 +20,24 @@ on: jobs: test: runs-on: ubuntu-latest - defaults: - run: - working-directory: ./database-seeds/scripts steps: - name: Checkout uses: actions/checkout@v2 - - name: Install Node.js 16 - uses: actions/setup-node@v2 + - uses: pnpm/action-setup@v2 with: - node-version: 16.x + version: latest - - name: Install PNPM - uses: pnpm/action-setup@v2.0.1 + - uses: actions/setup-node@v3 with: - version: 6.0.2 - - - name: Install Dependencies - run: pnpm i + node-version: 16 + cache: pnpm + + - name: Install dependencies + run: pnpm --filter tachi-database-seeds... --filter . install - name: Run Tests - run: pnpm test + run: pnpm --filter tachi-database-seeds test env: NODE_ENV: "test" @@ -49,9 +45,6 @@ jobs: runs-on: ubuntu-latest needs: [test] if: github.event_name == 'push' - defaults: - run: - working-directory: ./database-seeds/scripts steps: - name: Sync Staging Database if: github.ref == 'refs/heads/staging' diff --git a/.github/workflows/github-bot.yml b/.github/workflows/github-bot.yml index 9eec79282..7c634d19b 100644 --- a/.github/workflows/github-bot.yml +++ b/.github/workflows/github-bot.yml @@ -11,9 +11,6 @@ on: jobs: docker-push: runs-on: ubuntu-latest - defaults: - run: - working-directory: ./github-bot steps: - name: Checkout uses: actions/checkout@v3 @@ -46,9 +43,6 @@ jobs: run: echo ${{ steps.docker_build.outputs.digest }} deploy: runs-on: ubuntu-latest - defaults: - run: - working-directory: ./github-bot needs: [docker-push] steps: - name: Deploy diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index 7e93c7498..1d790aded 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -20,9 +20,6 @@ on: jobs: test: runs-on: ubuntu-latest - defaults: - run: - working-directory: ./server env: NODE_ENV: "test" CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} @@ -39,14 +36,14 @@ jobs: cache: pnpm - name: Install dependencies - run: pnpm --filter tachi-server... --filter . install --frozen-lockfile + run: pnpm --filter tachi-server... --filter . install # configure external dbs - uses: supercharge/mongodb-github-action@1.4.1 - uses: supercharge/redis-github-action@1.1.0 - name: Run tests - run: pnpm test + run: pnpm --filter tachi-server test env: NODE_ENV: "test" PORT: 8080