From 94fe95e4b1362b0b3b629e312d54292c87922993 Mon Sep 17 00:00:00 2001 From: "maria.martinez@gov.bc.ca" Date: Fri, 26 Aug 2022 16:14:28 -0700 Subject: [PATCH] no message --- .github/workflows/merge-dev.yml | 4 +- .github/workflows/merge-main.yml | 8 +-- .github/workflows/pr-close.yml | 6 +-- .github/workflows/pr-open.yml | 14 +++--- README.md | 1 - frontend/package-lock.json | 83 ++++++++++++++++---------------- 6 files changed, 58 insertions(+), 58 deletions(-) diff --git a/.github/workflows/merge-dev.yml b/.github/workflows/merge-dev.yml index ca76aaca3c..7f56b67bf7 100644 --- a/.github/workflows/merge-dev.yml +++ b/.github/workflows/merge-dev.yml @@ -134,7 +134,7 @@ jobs: - name: Delete old packages uses: davahome/ghcr-cleanup@v1 with: - token: ${{ secrets.GHCR_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} package: ${{ github.event.repository.name }} owner: orgs/bcgov skip_tags: prod-frontend,prod-backend @@ -200,7 +200,7 @@ jobs: - uses: actions/setup-node@v1 with: node-version: 10 - TOKEN: ${ secrets.GHCR_TOKEN } + TOKEN: ${ secrets.GITHUB_TOKEN } - name: Get GWA Command Line run: | diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml index b7542d5c6a..76eb5565a7 100644 --- a/.github/workflows/merge-main.yml +++ b/.github/workflows/merge-main.yml @@ -190,7 +190,7 @@ jobs: - name: Delete old packages uses: davahome/ghcr-cleanup@v1 with: - token: ${{ secrets.GHCR_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} package: ${{ github.event.repository.name }} owner: orgs/bcgov skip_tags: prod-frontend,prod-backend @@ -347,7 +347,7 @@ jobs: with: registry: ghcr.io repository: ${{ github.repository }} - token: ${{ secrets.GHCR_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} target: ${{ env.PREV }}-backend tags: | prod-backend @@ -357,7 +357,7 @@ jobs: with: registry: ghcr.io repository: ${{ github.repository }} - token: ${{ secrets.GHCR_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} target: ${{ env.PREV }}-frontend tags: | prod-frontend @@ -376,7 +376,7 @@ jobs: - uses: actions/setup-node@v1 with: node-version: 10 - TOKEN: ${ secrets.GHCR_TOKEN } + TOKEN: ${ secrets.GITHUB_TOKEN } - name: Get GWA Command Line run: | diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml index d1e09f71a9..402515625d 100644 --- a/.github/workflows/pr-close.yml +++ b/.github/workflows/pr-close.yml @@ -37,7 +37,7 @@ jobs: with: registry: ghcr.io repository: ${{ github.repository }} - token: ${{ secrets.GHCR_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} target: ${{ github.event.number }}-backend tags: | test-backend @@ -46,7 +46,7 @@ jobs: with: registry: ghcr.io repository: ${{ github.repository }} - token: ${{ secrets.GHCR_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} target: ${{ github.event.number }}-frontend tags: | test-frontend @@ -59,7 +59,7 @@ jobs: - name: Pre-merge update uses: mshick/add-pr-comment@v1 env: - GITHUB_TOKEN: ${{ secrets.GHCR_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: allow-repeats: false message: | diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index 872660c4aa..baa7c18076 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -49,7 +49,7 @@ jobs: with: registry: ${{ env.REGISTRY }} repository: ${{ github.repository }} - token: ${{ secrets.GHCR_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} target: prod-backend tags: | ${{ github.event.number }}-backend @@ -92,7 +92,7 @@ jobs: with: registry: ${{ env.REGISTRY }} repository: ${{ github.repository }} - token: ${{ secrets.GHCR_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} target: prod-frontend tags: | ${{ github.event.number }}-frontend @@ -125,7 +125,7 @@ jobs: with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} - password: ${{ secrets.GHCR_TOKEN }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push Backend Docker image uses: docker/build-push-action@v2 @@ -164,7 +164,7 @@ jobs: with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} - password: ${{ secrets.GHCR_TOKEN }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push Backend Docker image uses: docker/build-push-action@v2 @@ -218,7 +218,7 @@ jobs: with: title: Backend coverage report delete-old-comments: true - github-token: ${{ secrets.GHCR_TOKEN }} + github-token: ${{ secrets.GITHUB_TOKEN }} lcov-file: ./backend/coverage/lcov.info tests-frontend: @@ -264,7 +264,7 @@ jobs: with: title: Frontend coverage report delete-old-comments: true - github-token: ${{ secrets.GHCR_TOKEN }} + github-token: ${{ secrets.GITHUB_TOKEN }} lcov-file: ./frontend/coverage/lcov.info sonarcloud: @@ -381,7 +381,7 @@ jobs: - name: DEV Deployment update uses: mshick/add-pr-comment@v1 env: - GITHUB_TOKEN: ${{ secrets.GHCR_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: allow-repeats: false message: | diff --git a/README.md b/README.md index 2b86d6d795..4f58a6790d 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,6 @@ First need to create a new reposiroty in github - Add required secrets to github repo setting: - General secrets: - OC_SERVER: openshift cluster url - - GHCR_TOKEN: personal access token generated through user setting -> developer settings -> personal access token with the right to repo and write/delete package - Environment secrets: - Dev: OC_NAMESPACE (dev namespace), OC_TOKEN (get from openshift namespace -> administer view -> user management -> service account -> pipeline token) - Prod: OC_NAMESPACE (prod namespace), OC_TOKEN diff --git a/frontend/package-lock.json b/frontend/package-lock.json index af5bdd6e1c..32a43bd131 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -3567,26 +3567,6 @@ } } }, - "node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15": { - "name": "vue-loader", - "version": "15.10.0", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz", - "integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==", - "dev": true, - "dependencies": { - "@vue/component-compiler-utils": "^3.1.0", - "hash-sum": "^1.0.2", - "loader-utils": "^1.1.0", - "vue-hot-reload-api": "^2.3.0", - "vue-style-loader": "^4.1.0" - } - }, - "node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/node_modules/hash-sum": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", - "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", - "dev": true - }, "node_modules/@vue/cli-service/node_modules/dotenv": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", @@ -3907,6 +3887,26 @@ } } }, + "node_modules/@vue/vue-loader-v15": { + "name": "vue-loader", + "version": "15.10.0", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz", + "integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==", + "dev": true, + "dependencies": { + "@vue/component-compiler-utils": "^3.1.0", + "hash-sum": "^1.0.2", + "loader-utils": "^1.1.0", + "vue-hot-reload-api": "^2.3.0", + "vue-style-loader": "^4.1.0" + } + }, + "node_modules/@vue/vue-loader-v15/node_modules/hash-sum": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", + "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", + "dev": true + }, "node_modules/@vue/web-component-wrapper": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz", @@ -4857,6 +4857,7 @@ } ], "peerDependencies": { + "jquery": "1.9.1 - 3", "popper.js": "^1.16.1" } }, @@ -18520,27 +18521,6 @@ "whatwg-fetch": "^3.6.2" }, "dependencies": { - "@vue/vue-loader-v15": { - "version": "npm:vue-loader@15.10.0", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz", - "integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==", - "dev": true, - "requires": { - "@vue/component-compiler-utils": "^3.1.0", - "hash-sum": "^1.0.2", - "loader-utils": "^1.1.0", - "vue-hot-reload-api": "^2.3.0", - "vue-style-loader": "^4.1.0" - }, - "dependencies": { - "hash-sum": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", - "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", - "dev": true - } - } - }, "dotenv": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", @@ -18811,6 +18791,27 @@ "dev": true, "requires": {} }, + "@vue/vue-loader-v15": { + "version": "npm:vue-loader@15.10.0", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz", + "integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==", + "dev": true, + "requires": { + "@vue/component-compiler-utils": "^3.1.0", + "hash-sum": "^1.0.2", + "loader-utils": "^1.1.0", + "vue-hot-reload-api": "^2.3.0", + "vue-style-loader": "^4.1.0" + }, + "dependencies": { + "hash-sum": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", + "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", + "dev": true + } + } + }, "@vue/web-component-wrapper": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",