diff --git a/.eslintignore b/.eslintignore index 67fdabeb9c..6769653e57 100644 --- a/.eslintignore +++ b/.eslintignore @@ -7,4 +7,5 @@ vite.config.ts cypress front/src/assets/ public/assets/ -public/dsfr/ \ No newline at end of file +public/dsfr/ +back/transpile-back-and-prepare-for-prod.js \ No newline at end of file diff --git a/.github/workflows/deploy-to-scalingo-review-app.yml b/.github/workflows/deploy-to-scalingo-review-app.yml new file mode 100644 index 0000000000..92ab48721f --- /dev/null +++ b/.github/workflows/deploy-to-scalingo-review-app.yml @@ -0,0 +1,51 @@ +name: "Generic workflow to deploy to scalingo, given arguments" + +on: + workflow_call: + inputs: + pull_request_id: + type: number + required: true + run_number: + type: string + required: true + secrets: + SCALINGO_API_TOKEN: + required: true + +jobs: + deploy: + name: "Deploy to review app pr${{ inputs.pull_request_id }}" + runs-on: ubuntu-latest + environment: review-app + concurrency: + group: deploy-to-scalingo-pr${{ inputs.pull_request_id }} + cancel-in-progress: true + steps: + - uses: actions/checkout@v3 + - uses: pnpm/action-setup@v2 + with: + version: 8 + - name: Use Node.js + uses: actions/setup-node@v3 + with: + node-version: "18" + cache: "pnpm" + - name: Install scalingo CLI + run: | + wget -qO- https://cli-dl.scalingo.com/install.sh | bash + echo "$HOME/bin" >> $GITHUB_PATH + - name: Install dependencies + run: pnpm install + - name: Build front + run: NODE_OPTIONS=--max-old-space-size=4096 pnpm front build-scalingo + - name: Build back + run: pnpm back build + - name: Login to scalingo + run: scalingo login --api-token ${{ secrets.SCALINGO_API_TOKEN }} +# - name: Deploy back +# run: scalingo --app if-dev-back-pr${{ inputs.pull_request_id }} deploy back/back-build.tar.gz ${{ inputs.pull_request_id }}-${{ inputs.run_number }} + - name: Deploy front + run: scalingo --app if-dev-front-pr${{ inputs.pull_request_id }} deploy front/front-build.tar.gz ${{ inputs.pull_request_id }}-${{ inputs.run_number }} + - name: Run DB seed + run: scalingo --app if-dev-back-pr${{ inputs.pull_request_id }} run pnpm db:seed diff --git a/.github/workflows/fullcheck.yml b/.github/workflows/fullcheck.yml index 8afcfcfb9d..2535b7992f 100644 --- a/.github/workflows/fullcheck.yml +++ b/.github/workflows/fullcheck.yml @@ -1,10 +1,6 @@ name: "Fullcheck of the project + integration tests" on: - push: - branches-ignore: - - main - workflow_call: jobs: diff --git a/.github/workflows/review-app.yml b/.github/workflows/review-app.yml new file mode 100644 index 0000000000..79c3e8efe6 --- /dev/null +++ b/.github/workflows/review-app.yml @@ -0,0 +1,17 @@ +name: "Review app" + +on: + pull_request: + +jobs: + validation: + uses: ./.github/workflows/fullcheck.yml + + deploy-review-app: + uses: ./.github/workflows/deploy-to-scalingo-review-app.yml +# needs: validation + with: + pull_request_id: ${{ github.event.number }} + run_number: ${{ github.run_number }} + secrets: + SCALINGO_API_TOKEN: ${{ secrets.SCALINGO_API_TOKEN }} \ No newline at end of file diff --git a/.prettierignore b/.prettierignore index 12c74a5e34..e6939dcad0 100644 --- a/.prettierignore +++ b/.prettierignore @@ -7,4 +7,3 @@ public/dsfr/ .git/ .idea/ .angular/ -back/transpile-back-and-prepare-for-prod.js diff --git a/back/.prettierignore b/back/.prettierignore new file mode 100644 index 0000000000..d66b61ba31 --- /dev/null +++ b/back/.prettierignore @@ -0,0 +1 @@ +transpile-back-and-prepare-for-prod.js diff --git a/back/transpile-back-and-prepare-for-prod.js b/back/transpile-back-and-prepare-for-prod.js index 68583911d7..3cd247169a 100644 --- a/back/transpile-back-and-prepare-for-prod.js +++ b/back/transpile-back-and-prepare-for-prod.js @@ -26,7 +26,7 @@ console.log("Copying package.json of back for prod"); fs.copyFileSync("./package.json", "build/back/package.json"); execSync( - "cp -v -R ./src/adapters/secondary/pg/staticData build/back/src/adapters/secondary/pg/staticData" + "cp -v -R ./src/adapters/secondary/pg/staticData build/back/src/adapters/secondary/pg" ); // Copy dependencies package.json files to build directory