From 7f4880b060107896dbb1264fd53924f6bcc23f99 Mon Sep 17 00:00:00 2001 From: SydZero <63630743+SydZero@users.noreply.github.com> Date: Wed, 16 Oct 2024 16:43:52 -0700 Subject: [PATCH] moving around lines --- .github/workflows/codecov.yml | 2 +- .github/workflows/docker_image.yml | 1 - .github/workflows/dotnet.yml | 8 ++++++-- .github/workflows/npm_build_test.yml | 17 +++++++++-------- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 0af12bd..2ad70aa 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -5,7 +5,7 @@ on: branches: - main - codecov-workflows - - workflows + #- workflows pull_request: branches: - main diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml index dcf8599..4d17ce7 100644 --- a/.github/workflows/docker_image.yml +++ b/.github/workflows/docker_image.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - workflows tags: - 'v*.*.*' workflow_dispatch: diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 013e359..07d57cb 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -2,9 +2,13 @@ name: .NET Build and Test on: push: - branches: [ "main", "workflows" ] + branches: + - main + #- workflows pull_request: - branches: [ "main" ] + branches: + - main + #- workflows jobs: build: diff --git a/.github/workflows/npm_build_test.yml b/.github/workflows/npm_build_test.yml index db7d7e8..36bf777 100644 --- a/.github/workflows/npm_build_test.yml +++ b/.github/workflows/npm_build_test.yml @@ -33,14 +33,15 @@ jobs: node-version: ${{ matrix.node-version }} cache: 'npm' - - run: npm ci - working-directory: ./frontend - - - run: npm run build --if-present - working-directory: ./frontend - - - run: npm test - working-directory: ./frontend + - working-directory: ./chemistry-cafe/frontend + run: npm ci + + + - working-directory: ./chemistry-cafe/frontend + run: npm run build --if-present + + - working-directory: ./chemistry-cafe/frontend + run: npm test - name: Upload coverage to Codecov uses: codecov/codecov-action@v1