diff --git a/.github/workflows/admin-scw.yml b/.github/workflows/admin-scw.yml index c078ce784e..893292aea7 100644 --- a/.github/workflows/admin-scw.yml +++ b/.github/workflows/admin-scw.yml @@ -3,7 +3,7 @@ name: ADMIN - Build Docker image & Deploy Scaleway on: push: branches: - - feat-1469 + - main paths: - admin/** - packages/** @@ -30,6 +30,8 @@ jobs: strategy: matrix: node-version: [18.x] + env: + ACTIVE_HOSTING: ${{ secrets.ACTIVE_HOSTING }} steps: - uses: actions/checkout@v2 @@ -46,8 +48,7 @@ jobs: ssh_known_hosts: ${{ secrets.SSH_KNOWN_HOSTS }} - name: Remove git folder - run: | - rm -rf .git + run: rm -rf .git - name: Docker Build & Publish uses: ./.github/actions/docker @@ -59,6 +60,7 @@ jobs: dockerfile_path: admin/Dockerfile - name: Scaleway container deploy + if: env.ACTIVE_HOSTING == 'scaleway' uses: ./.github/actions/docker-scw-deploy with: secret_key: ${{ secrets.SCW_SECRET_KEY }} diff --git a/.github/workflows/api-ovh.yml b/.github/workflows/api-ovh.yml index cb58304fa0..3fe8b02899 100644 --- a/.github/workflows/api-ovh.yml +++ b/.github/workflows/api-ovh.yml @@ -3,7 +3,7 @@ name: API - Build Docker image & Deploy OVH on: push: branches: - - feat-1469 + - main paths: - api/** - packages/** diff --git a/.github/workflows/api-scw.yml b/.github/workflows/api-scw.yml index 450f1c1c3a..e3eadb527f 100644 --- a/.github/workflows/api-scw.yml +++ b/.github/workflows/api-scw.yml @@ -3,13 +3,13 @@ name: API - Build Docker image & Deploy Scaleway on: push: branches: - - feat-1469 + - main paths: - api/** - packages/** jobs: - build: + build_deploy: runs-on: ubuntu-latest env: ACTIVE_HOSTING: ${{ secrets.ACTIVE_HOSTING }} diff --git a/.github/workflows/app-scw.yml b/.github/workflows/app-scw.yml index fdc270fc6e..1c76be23a3 100644 --- a/.github/workflows/app-scw.yml +++ b/.github/workflows/app-scw.yml @@ -3,7 +3,7 @@ name: APP - Build Docker image & Deploy Scaleway on: push: branches: - - feat-1469 + - main paths: - app/** - packages/** @@ -30,6 +30,8 @@ jobs: strategy: matrix: node-version: [18.x] + env: + ACTIVE_HOSTING: ${{ secrets.ACTIVE_HOSTING }} steps: - uses: actions/checkout@v2 @@ -46,8 +48,7 @@ jobs: ssh_known_hosts: ${{ secrets.SSH_KNOWN_HOSTS }} - name: Remove git folder - run: | - rm -rf .git + run: rm -rf .git - name: Docker Build & Publish uses: ./.github/actions/docker @@ -59,6 +60,7 @@ jobs: dockerfile_path: app/Dockerfile - name: Scaleway container deploy + if: env.ACTIVE_HOSTING == 'scaleway' uses: ./.github/actions/docker-scw-deploy with: secret_key: ${{ secrets.SCW_SECRET_KEY }} diff --git a/api/src/index.js b/api/src/index.js index 7628db036f..07948c754f 100644 --- a/api/src/index.js +++ b/api/src/index.js @@ -158,7 +158,7 @@ const validateCustomHeader = require("./middlewares/validateCustomHeader"); app.get("/", async (req, res) => { const d = new Date(); - res.status(200).send("SNU OVH Deploy v16" + d.toLocaleString()); + res.status(200).send("SNU " + d.toLocaleString()); }); app.get("/testsentry", async (req, res) => {