diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index af2d71d7..d750574a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: main on: [push, pull_request] jobs: - setup_stage: + build: runs-on: ubuntu-latest steps: @@ -13,78 +13,17 @@ jobs: - name: Setup Node uses: actions/setup-node@v3.8.2 with: - node-version: "16" + node-version: '16' - client_dependencies: - needs: - - setup_stage - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3.6.0 - - - name: Setup Node - uses: actions/setup-node@v3.8.2 - with: - node-version: "16" - name: Install client dependencies - run: | - cd client - npm install - cd .. - - client_build: - needs: - - client_dependencies - runs-on: ubuntu-latest - steps: - - name: Build client - run: | - cd client - npm run build - cd .. + run: cd client && npm install && cd .. - server_dependencies: - needs: - - setup_stage - runs-on: ubuntu-latest - steps: - name: Install server dependencies - run: | - cd server - npm install - cd .. + run: cd server && npm install && cd .. - client_testing: - needs: - - client_build - runs-on: ubuntu-latest - steps: - - name: Frontend Tests - if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'master' || github.event_name == 'push' && github.ref == 'refs/heads/master' }} - run: | - cd client - npm run test - cd .. - - server_testing: - needs: - - server_dependencies - runs-on: ubuntu-latest - steps: + - name: Build client + run: cd client && npm run build && cd .. + - name: Frontend Tests if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'master' || github.event_name == 'push' && github.ref == 'refs/heads/master' }} - run: | - echo "TBD" - - deploy: - if: ${{ github.event_name == 'push' && github.event.pull_request.base.ref == 'deploy' || github.event_name == 'push' && github.ref == 'refs/heads/deploy' }} - needs: - - client_testing - - server_testing - runs-on: ubuntu-latest - steps: - - name: SSH Server - if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'master' || github.event_name == 'push' && github.ref == 'refs/heads/master' }} - run: | - echo "TBD" + run: cd client && npm run test && cd ..