Merge pull request #13 from dfinity/testci

Fixing CI
dfinity · Jul 31, 2024 · cc1aaa1 · cc1aaa1
2 parents 5869bf9 + 4001a88
commit cc1aaa1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/airflow-containers.yaml b/.github/workflows/airflow-containers.yaml
@@ -6,6 +6,7 @@ on:
     paths:
       - airflow-content-syncer/**
       - airflow-customized/**
+      - .github/**
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -14,7 +15,7 @@ concurrency:
 jobs:
   airflow-content-syncer:
     name: Publish Airflow content syncer container
-    if: github.event_name == 'push' and github.ref == 'refs/heads/main'
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     # This image is based on ubuntu:20.04
     steps:
@@ -48,6 +49,7 @@ jobs:
           context: airflow-content-syncer
   airflow-customized:
     name: Publish customized Airflow container
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     # This image is based on ubuntu:20.04
     steps:

diff --git a/.github/workflows/rollout-dashboard.yaml b/.github/workflows/rollout-dashboard.yaml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
-      - run: mv -f rollout-dashboard/server/* rollout-dashboard/server/.[a-z]* .
+      - run: mv -f rollout-dashboard/server/* .
       - uses: actions-rs/cargo@v1
         with:
           command: test
@@ -39,10 +39,10 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: "20.x"
-      - run: mv -f rollout-dashboard/frontend/* rollout-dashboard/frontend/.[a-z]* .
+      - run: mv -f rollout-dashboard/frontend/* .
       - run: npm ci
-      - run: npm run build --if-present
-      - run: npm test
+      - run: npm run build
+      - run: npm run check
   build-rollout-dashboard-container:
     name: Publish rollout dashboard container
     if: github.event_name == 'pull_request'
@@ -76,7 +76,7 @@ jobs:
           context: rollout-dashboard
   publish-rollout-dashboard-container:
     name: Publish rollout dashboard container
-    if: github.event_name == 'push' and github.ref == 'refs/heads/main'
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4