Update install/ paths in GitHub workflow files.

scpwiki · Dec 1, 2024 · ae26bd4 · ae26bd4
1 parent a3d4d0b
commit ae26bd4
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 27 deletions.
diff --git a/.github/workflows/deepwell.yaml b/.github/workflows/deepwell.yaml
@@ -9,10 +9,9 @@ on:
       - '.github/workflows/deepwell.yaml'
       - '.github/codecov.yml'
       - 'deepwell/config.example.toml'
-      - 'install/files/local/deepwell.toml'
-      # TODO: add install/files/dev/deepwell.toml
-      #       and install/files/prod/deepwell.toml
-      #       both here and below
+      - 'install/local/api/deepwell.toml'
+      - 'install/dev/api/deepwell.toml'
+      - 'install/prod/api/deepwell.toml'
   push:
     branches:
       - develop
@@ -52,7 +51,7 @@ jobs:
         run: cd deepwell && cargo build --all-features
 
       - name: Check Configuration
-        run: cd deepwell && cargo run -- config.example.toml ../install/files/local/deepwell.toml
+        run: cd deepwell && cargo run -- config.example.toml ../install/local/api/deepwell.toml ../install/dev/api/deepwell.toml ../prod/api/deepwell.toml
         env:
           DEEPWELL_SPECIAL_ACTION: validate-config
 

diff --git a/.github/workflows/docker-build-api.dev.yaml b/.github/workflows/docker-build-api.dev.yaml
@@ -4,7 +4,7 @@ on:
   pull_request:
     paths:
       - 'deepwell/**'
-      - 'install/dev/digitalocean/api/Dockerfile'
+      - 'install/dev/api/Dockerfile'
       - '.github/workflows/docker-build-api.dev.yaml'
 
 jobs:
@@ -15,6 +15,6 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build image
-        run: docker build -f install/dev/digitalocean/api/Dockerfile .
+        run: docker build -f install/dev/api/Dockerfile .
         env:
           DOCKER_BUILDKIT: 1
diff --git a/.github/workflows/docker-build-api.local.yaml b/.github/workflows/docker-build-api.local.yaml
@@ -4,7 +4,7 @@ on:
   pull_request:
     paths:
       - 'deepwell/**'
-      - 'install/local/dev/api/Dockerfile'
+      - 'install/local/api/Dockerfile'
       - '.github/workflows/docker-build-api.local.yaml'
 
 jobs:
@@ -15,6 +15,6 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build image
-        run: docker build -f install/local/dev/api/Dockerfile .
+        run: docker build -f install/local/api/Dockerfile .
         env:
           DOCKER_BUILDKIT: 1
diff --git a/.github/workflows/docker-build-api.prod.yaml b/.github/workflows/docker-build-api.prod.yaml
@@ -4,7 +4,7 @@ on:
   pull_request:
     paths:
       - 'deepwell/**'
-      - 'install/aws/prod/docker/api/Dockerfile'
+      - 'install/prod/api/Dockerfile'
       - '.github/workflows/docker-build-api.prod.yaml'
 
 jobs:
@@ -15,6 +15,6 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build image
-        run: docker build -f install/aws/prod/docker/api/Dockerfile .
+        run: docker build -f install/prod/api/Dockerfile .
         env:
           DOCKER_BUILDKIT: 1
diff --git a/.github/workflows/docker-build-minio.local.yaml b/.github/workflows/docker-build-minio.local.yaml
@@ -3,7 +3,7 @@ name: '[backend] Docker build Minio (local)'
 on:
   pull_request:
     paths:
-      - 'install/local/dev/minio/*'
+      - 'install/local/minio/*'
       - '.github/workflows/docker-build-minio.local.yaml'
 
 jobs:
@@ -14,6 +14,6 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build image
-        run: cd install/local/dev/minio && docker build .
+        run: cd install/local/minio && docker build .
         env:
           DOCKER_BUILDKIT: 1
diff --git a/.github/workflows/docker-build-postgres.local.yaml b/.github/workflows/docker-build-postgres.local.yaml
@@ -4,8 +4,8 @@ on:
   pull_request:
     paths:
       - 'web/database/**'
-      - 'install/files/postgres/**'
-      - 'install/local/dev/postgres/Dockerfile'
+      - 'install/common/postgres/**'
+      - 'install/local/postgres/Dockerfile'
       - '.github/workflows/docker-build-postgres.local.yaml'
 
 jobs:
@@ -16,6 +16,6 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build image
-        run: docker build -f install/local/dev/postgres/Dockerfile .
+        run: docker build -f install/local/postgres/Dockerfile .
         env:
           DOCKER_BUILDKIT: 1
diff --git a/.github/workflows/docker-build-postgres.prod.yaml b/.github/workflows/docker-build-postgres.prod.yaml
@@ -4,8 +4,8 @@ on:
   pull_request:
     paths:
       - 'web/database/**'
-      - 'install/files/postgres/**'
-      - 'install/aws/prod/docker/postgres/Dockerfile'
+      - 'install/common/postgres/**'
+      - 'install/prod/postgres/Dockerfile'
       - '.github/workflows/docker-build-postgres.prod.yaml'
 
 jobs:
@@ -16,6 +16,6 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build image
-        run: docker build -f install/aws/prod/docker/postgres/Dockerfile .
+        run: docker build -f install/prod/postgres/Dockerfile .
         env:
           DOCKER_BUILDKIT: 1
diff --git a/.github/workflows/docker-build-redis.local.yaml b/.github/workflows/docker-build-redis.local.yaml
@@ -3,7 +3,7 @@ name: '[backend] Docker build Redis (local)'
 on:
   pull_request:
     paths:
-      - 'install/local/dev/redis/*'
+      - 'install/local/redis/*'
       - '.github/workflows/docker-build-redis.local.yaml'
 
 jobs:
@@ -14,6 +14,6 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build image
-        run: cd install/local/dev/redis && docker build .
+        run: cd install/local/redis && docker build .
         env:
           DOCKER_BUILDKIT: 1
diff --git a/.github/workflows/docker-build-web.dev.yaml b/.github/workflows/docker-build-web.dev.yaml
@@ -4,7 +4,7 @@ on:
   pull_request:
     paths:
       - 'framerail/**'
-      - 'install/dev/digitalocean/web/Dockerfile'
+      - 'install/dev/web/Dockerfile'
       - '.github/workflows/docker-build-web.dev.yaml'
 
 jobs:
@@ -15,6 +15,6 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build image
-        run: docker build -f install/dev/digitalocean/web/Dockerfile .
+        run: docker build -f install/dev/web/Dockerfile .
         env:
           DOCKER_BUILDKIT: 1
diff --git a/.github/workflows/docker-build-web.local.yaml b/.github/workflows/docker-build-web.local.yaml
@@ -4,7 +4,7 @@ on:
   pull_request:
     paths:
       - 'framerail/**'
-      - 'install/local/dev/web/Dockerfile'
+      - 'install/local/web/Dockerfile'
       - '.github/workflows/docker-build-web.local.yaml'
 
 jobs:
@@ -15,6 +15,6 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build image
-        run: docker build -f install/local/dev/web/Dockerfile .
+        run: docker build -f install/local/web/Dockerfile .
         env:
           DOCKER_BUILDKIT: 1
diff --git a/.github/workflows/docker-build-web.prod.yaml b/.github/workflows/docker-build-web.prod.yaml
@@ -4,7 +4,7 @@ on:
   pull_request:
     paths:
       - 'framerail/**'
-      - 'install/aws/prod/docker/web/Dockerfile'
+      - 'install/prod/web/Dockerfile'
       - '.github/workflows/docker-build-web.prod.yaml'
 
 jobs:
@@ -15,6 +15,6 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build image
-        run: docker build -f install/aws/prod/docker/web/Dockerfile .
+        run: docker build -f install/prod/web/Dockerfile .
         env:
           DOCKER_BUILDKIT: 1