From 08a390b56efa06f030a7e69aa997f962f4c757fd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 13:03:41 -0700 Subject: [PATCH 01/10] Update actions/checkout action to v4.1.3 (#1416) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/check.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/deploy-to-development-premium.yml | 4 ++-- .github/workflows/deploy-to-development2-premium.yml | 4 ++-- .github/workflows/deploy-to-development3-premium.yml | 4 ++-- .github/workflows/deploy-to-production-premium.yml | 4 ++-- .github/workflows/deploy-to-staging-premium.yml | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 6591fe7d..3cb78b9d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 - name: Build uses: ./.github/actions/build with: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 87432854..0c9cdebc 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,7 +38,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/deploy-to-development-premium.yml b/.github/workflows/deploy-to-development-premium.yml index 969241a7..3c255abb 100644 --- a/.github/workflows/deploy-to-development-premium.yml +++ b/.github/workflows/deploy-to-development-premium.yml @@ -12,7 +12,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 - name: Build uses: ./.github/actions/build with: @@ -27,7 +27,7 @@ jobs: url: https://talk.brave.software steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 - name: Configure aws credentials uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2 diff --git a/.github/workflows/deploy-to-development2-premium.yml b/.github/workflows/deploy-to-development2-premium.yml index 199b73b6..235e4e82 100644 --- a/.github/workflows/deploy-to-development2-premium.yml +++ b/.github/workflows/deploy-to-development2-premium.yml @@ -12,7 +12,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 - name: Build uses: ./.github/actions/build with: @@ -27,7 +27,7 @@ jobs: url: https://dev2.talk.brave.software steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 - name: Configure aws credentials uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2 diff --git a/.github/workflows/deploy-to-development3-premium.yml b/.github/workflows/deploy-to-development3-premium.yml index 8f7055fb..e596cb5e 100644 --- a/.github/workflows/deploy-to-development3-premium.yml +++ b/.github/workflows/deploy-to-development3-premium.yml @@ -12,7 +12,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 - name: Build uses: ./.github/actions/build with: @@ -27,7 +27,7 @@ jobs: url: https://dev3.talk.brave.software steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 - name: Configure aws credentials uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2 diff --git a/.github/workflows/deploy-to-production-premium.yml b/.github/workflows/deploy-to-production-premium.yml index dffb3f8d..e9c47117 100644 --- a/.github/workflows/deploy-to-production-premium.yml +++ b/.github/workflows/deploy-to-production-premium.yml @@ -11,7 +11,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 - name: Build uses: ./.github/actions/build with: @@ -26,7 +26,7 @@ jobs: url: https://talk.brave.com steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 - name: Configure aws credentials uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2 diff --git a/.github/workflows/deploy-to-staging-premium.yml b/.github/workflows/deploy-to-staging-premium.yml index 392b9470..c236e5da 100644 --- a/.github/workflows/deploy-to-staging-premium.yml +++ b/.github/workflows/deploy-to-staging-premium.yml @@ -11,7 +11,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 - name: Build uses: ./.github/actions/build with: @@ -26,7 +26,7 @@ jobs: url: https://talk.bravesoftware.com steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 - name: Configure aws credentials uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2 From a48c2041d389656c253b0f9f25af48ee8139adca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 13:03:59 -0700 Subject: [PATCH 02/10] Update actions/upload-artifact action to v4.3.2 (#1419) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/actions/build/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index fcc4e94c..feb713e9 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -31,7 +31,7 @@ runs: # fail the build if any generated javascript contains 'eval' to help mitigate the need for script-src unsafe-eval CSP if find html -name "*.js" | xargs grep -El "\beval\("; then echo '"eval" found'; exit 99; else echo '"eval" not found'; fi - name: Upload built outputs - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 + uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # v4.3.2 with: name: build-output path: html From 52a392b81527001be0c2116edb74d830fcdba586 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 13:04:18 -0700 Subject: [PATCH 03/10] Update actions/download-artifact action to v4.1.5 (#1417) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/actions/deploy/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/deploy/action.yml b/.github/actions/deploy/action.yml index 8f5fa749..46022363 100644 --- a/.github/actions/deploy/action.yml +++ b/.github/actions/deploy/action.yml @@ -11,7 +11,7 @@ inputs: runs: using: composite steps: - - uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4 + - uses: actions/download-artifact@8caf195ad4b1dee92908e23f56eeb0696f1dd42d # v4.1.5 with: name: build-output path: html From 71b42af7c6a73e2c77473d22d4a5c7d2e07d416d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 11:39:09 -0400 Subject: [PATCH 04/10] Update all non-major dependencies (#1420) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 42 +++++++++++++++++++++--------------------- package.json | 6 +++--- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5bf02293..0604caf9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@emotion/react": "11.11.4", "@types/dom-screen-wake-lock": "1.0.3", "buffer": "6.0.3", - "ethers": "6.11.1", + "ethers": "6.12.0", "i18next": "23.11.2", "jest-environment-jsdom": "29.7.0", "react": "18.2.0", @@ -21,7 +21,7 @@ "devDependencies": { "@brave-intl/skus-sdk": "0.1.3", "@types/jest": "29.5.12", - "@types/react": "18.2.78", + "@types/react": "18.2.79", "@types/react-dom": "18.2.25", "@typescript-eslint/eslint-plugin": "6.21.0", "@typescript-eslint/parser": "6.21.0", @@ -36,7 +36,7 @@ "husky": "9.0.11", "jest": "29.7.0", "lint-staged": "15.2.2", - "mini-css-extract-plugin": "2.8.1", + "mini-css-extract-plugin": "2.9.0", "node-forge": "1.3.1", "npm-run-all2": "6.1.2", "prettier": "3.2.5", @@ -1724,9 +1724,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.78", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.78.tgz", - "integrity": "sha512-qOwdPnnitQY4xKlKayt42q5W5UQrSHjgoXNVEtxeqdITJ99k4VXJOP3vt8Rkm9HmgJpH50UNU+rlqfkfWOqp0A==", + "version": "18.2.79", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.79.tgz", + "integrity": "sha512-RwGAGXPl9kSXwdNTafkOEuFrTBD5SA2B3iEB96xi8+xu5ddUa/cpvyVCSNn+asgLCTHkb5ZxN8gbuibYJi4s1w==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -4672,9 +4672,9 @@ } }, "node_modules/ethers": { - "version": "6.11.1", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.11.1.tgz", - "integrity": "sha512-mxTAE6wqJQAbp5QAe/+o+rXOID7Nw91OZXvgpjDa1r4fAbq2Nu314oEZSbjoRLacuCzs7kUC3clEvkCQowffGg==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.12.0.tgz", + "integrity": "sha512-zL5NlOTjML239gIvtVJuaSk0N9GQLi1Hom3ZWUszE5lDTQE/IVB62mrPkQ2W1bGcZwVGSLaetQbWNQSvI4rGDQ==", "funding": [ { "type": "individual", @@ -7853,9 +7853,9 @@ } }, "node_modules/mini-css-extract-plugin": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.1.tgz", - "integrity": "sha512-/1HDlyFRxWIZPI1ZpgqlZ8jMw/1Dp/dl3P0L1jtZ+zVcHqwPhGwaJwKL00WVgfnBy6PWCde9W65or7IIETImuA==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.0.tgz", + "integrity": "sha512-Zs1YsZVfemekSZG+44vBsYTLQORkPMwnlv+aehcxK/NLKC+EGhDB39/YePYYqx/sTk6NnYpuqikhSn7+JIevTA==", "dev": true, "dependencies": { "schema-utils": "^4.0.0", @@ -13107,9 +13107,9 @@ "dev": true }, "@types/react": { - "version": "18.2.78", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.78.tgz", - "integrity": "sha512-qOwdPnnitQY4xKlKayt42q5W5UQrSHjgoXNVEtxeqdITJ99k4VXJOP3vt8Rkm9HmgJpH50UNU+rlqfkfWOqp0A==", + "version": "18.2.79", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.79.tgz", + "integrity": "sha512-RwGAGXPl9kSXwdNTafkOEuFrTBD5SA2B3iEB96xi8+xu5ddUa/cpvyVCSNn+asgLCTHkb5ZxN8gbuibYJi4s1w==", "dev": true, "requires": { "@types/prop-types": "*", @@ -15255,9 +15255,9 @@ "dev": true }, "ethers": { - "version": "6.11.1", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.11.1.tgz", - "integrity": "sha512-mxTAE6wqJQAbp5QAe/+o+rXOID7Nw91OZXvgpjDa1r4fAbq2Nu314oEZSbjoRLacuCzs7kUC3clEvkCQowffGg==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.12.0.tgz", + "integrity": "sha512-zL5NlOTjML239gIvtVJuaSk0N9GQLi1Hom3ZWUszE5lDTQE/IVB62mrPkQ2W1bGcZwVGSLaetQbWNQSvI4rGDQ==", "requires": { "@adraffy/ens-normalize": "1.10.1", "@noble/curves": "1.2.0", @@ -17515,9 +17515,9 @@ "dev": true }, "mini-css-extract-plugin": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.1.tgz", - "integrity": "sha512-/1HDlyFRxWIZPI1ZpgqlZ8jMw/1Dp/dl3P0L1jtZ+zVcHqwPhGwaJwKL00WVgfnBy6PWCde9W65or7IIETImuA==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.0.tgz", + "integrity": "sha512-Zs1YsZVfemekSZG+44vBsYTLQORkPMwnlv+aehcxK/NLKC+EGhDB39/YePYYqx/sTk6NnYpuqikhSn7+JIevTA==", "dev": true, "requires": { "schema-utils": "^4.0.0", diff --git a/package.json b/package.json index 1090fb63..234e78e9 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "devDependencies": { "@brave-intl/skus-sdk": "0.1.3", "@types/jest": "29.5.12", - "@types/react": "18.2.78", + "@types/react": "18.2.79", "@types/react-dom": "18.2.25", "@typescript-eslint/eslint-plugin": "6.21.0", "@typescript-eslint/parser": "6.21.0", @@ -44,7 +44,7 @@ "husky": "9.0.11", "jest": "29.7.0", "lint-staged": "15.2.2", - "mini-css-extract-plugin": "2.8.1", + "mini-css-extract-plugin": "2.9.0", "node-forge": "1.3.1", "npm-run-all2": "6.1.2", "prettier": "3.2.5", @@ -61,7 +61,7 @@ "@emotion/react": "11.11.4", "@types/dom-screen-wake-lock": "1.0.3", "buffer": "6.0.3", - "ethers": "6.11.1", + "ethers": "6.12.0", "i18next": "23.11.2", "jest-environment-jsdom": "29.7.0", "react": "18.2.0", From d1a075528f198a2a06f983f7775f4eb7ab1f3104 Mon Sep 17 00:00:00 2001 From: Darnell Andries Date: Fri, 26 Apr 2024 12:12:20 -0700 Subject: [PATCH 05/10] Use jaas prod on dev2 (#1421) --- src/environment.ts | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/environment.ts b/src/environment.ts index 8318566c..38c23a54 100644 --- a/src/environment.ts +++ b/src/environment.ts @@ -1,14 +1,23 @@ export const env = process.env.ENVIRONMENT ?? "local"; export const isDevelopment = env.startsWith("development") || env === "local"; +const useJaasPilot = isDevelopment && env !== "development2"; + +let vpaas = ""; +if (isDevelopment) { + if (useJaasPilot) { + vpaas = "vpaas-magic-cookie-41b5e4eb989e414cac4fe7f51400a1d7"; + } else { + vpaas = "vpaas-magic-cookie-cd4131ef77674a71b73411408226e232"; + } +} else if (env === "staging") { + vpaas = "vpaas-magic-cookie-520aa9362071418c8a8661950bc0a470"; +} else { + vpaas = "vpaas-magic-cookie-a4818bd762a044998d717b70ac734cfe"; +} + export const config = { - vpaas: isDevelopment - ? "vpaas-magic-cookie-41b5e4eb989e414cac4fe7f51400a1d7" - : env === "staging" - ? "vpaas-magic-cookie-520aa9362071418c8a8661950bc0a470" - : env === "local" - ? "vpaas-magic-cookie-cd4131ef77674a71b73411408226e232" - : "vpaas-magic-cookie-a4818bd762a044998d717b70ac734cfe", - webrtc_domain: isDevelopment ? "stage.8x8.vc" : "8x8.vc", + vpaas, + webrtc_domain: useJaasPilot ? "stage.8x8.vc" : "8x8.vc", }; export const isProduction = env === "production"; From f045cee5d73ebc26cf7e245d9b19124f1533e245 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 12:23:09 -0700 Subject: [PATCH 06/10] Update actions/checkout action to v4.1.4 (#1422) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/check.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/deploy-to-development-premium.yml | 4 ++-- .github/workflows/deploy-to-development2-premium.yml | 4 ++-- .github/workflows/deploy-to-development3-premium.yml | 4 ++-- .github/workflows/deploy-to-production-premium.yml | 4 ++-- .github/workflows/deploy-to-staging-premium.yml | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 3cb78b9d..c36f7f80 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Build uses: ./.github/actions/build with: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0c9cdebc..4cfb2d0c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,7 +38,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/deploy-to-development-premium.yml b/.github/workflows/deploy-to-development-premium.yml index 3c255abb..3d70917f 100644 --- a/.github/workflows/deploy-to-development-premium.yml +++ b/.github/workflows/deploy-to-development-premium.yml @@ -12,7 +12,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Build uses: ./.github/actions/build with: @@ -27,7 +27,7 @@ jobs: url: https://talk.brave.software steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Configure aws credentials uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2 diff --git a/.github/workflows/deploy-to-development2-premium.yml b/.github/workflows/deploy-to-development2-premium.yml index 235e4e82..f85a6741 100644 --- a/.github/workflows/deploy-to-development2-premium.yml +++ b/.github/workflows/deploy-to-development2-premium.yml @@ -12,7 +12,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Build uses: ./.github/actions/build with: @@ -27,7 +27,7 @@ jobs: url: https://dev2.talk.brave.software steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Configure aws credentials uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2 diff --git a/.github/workflows/deploy-to-development3-premium.yml b/.github/workflows/deploy-to-development3-premium.yml index e596cb5e..a8c3de4f 100644 --- a/.github/workflows/deploy-to-development3-premium.yml +++ b/.github/workflows/deploy-to-development3-premium.yml @@ -12,7 +12,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Build uses: ./.github/actions/build with: @@ -27,7 +27,7 @@ jobs: url: https://dev3.talk.brave.software steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Configure aws credentials uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2 diff --git a/.github/workflows/deploy-to-production-premium.yml b/.github/workflows/deploy-to-production-premium.yml index e9c47117..7614bccb 100644 --- a/.github/workflows/deploy-to-production-premium.yml +++ b/.github/workflows/deploy-to-production-premium.yml @@ -11,7 +11,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Build uses: ./.github/actions/build with: @@ -26,7 +26,7 @@ jobs: url: https://talk.brave.com steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Configure aws credentials uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2 diff --git a/.github/workflows/deploy-to-staging-premium.yml b/.github/workflows/deploy-to-staging-premium.yml index c236e5da..02e43e97 100644 --- a/.github/workflows/deploy-to-staging-premium.yml +++ b/.github/workflows/deploy-to-staging-premium.yml @@ -11,7 +11,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Build uses: ./.github/actions/build with: @@ -26,7 +26,7 @@ jobs: url: https://talk.bravesoftware.com steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Configure aws credentials uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2 From c2c0e1ef284d6cbb3cc4ee3350fd1f4702c7f4a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 12:26:08 -0700 Subject: [PATCH 07/10] Update actions/download-artifact action to v4.1.7 (#1423) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/actions/deploy/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/deploy/action.yml b/.github/actions/deploy/action.yml index 46022363..5c332c0b 100644 --- a/.github/actions/deploy/action.yml +++ b/.github/actions/deploy/action.yml @@ -11,7 +11,7 @@ inputs: runs: using: composite steps: - - uses: actions/download-artifact@8caf195ad4b1dee92908e23f56eeb0696f1dd42d # v4.1.5 + - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 with: name: build-output path: html From 14b2c500b96294a3ddb85ae62835fbc01314cc5d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 12:26:29 -0700 Subject: [PATCH 08/10] Update actions/upload-artifact action to v4.3.3 (#1424) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/actions/build/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index feb713e9..a7a0ee4c 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -31,7 +31,7 @@ runs: # fail the build if any generated javascript contains 'eval' to help mitigate the need for script-src unsafe-eval CSP if find html -name "*.js" | xargs grep -El "\beval\("; then echo '"eval" found'; exit 99; else echo '"eval" not found'; fi - name: Upload built outputs - uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # v4.3.2 + uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: name: build-output path: html From 50cc95bd8da2ca709217c0ee8a4b08f34db627b0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 12:26:39 -0700 Subject: [PATCH 09/10] Update github/codeql-action action to v3.25.3 (#1425) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 4cfb2d0c..41feaa3f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -42,7 +42,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0 + uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -53,7 +53,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0 + uses: github/codeql-action/autobuild@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3 # ℹ️ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -67,4 +67,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0 + uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3 From a67f5f360080e2852ee012e02bc9fe52367ee2b8 Mon Sep 17 00:00:00 2001 From: "Marshall T. Rose" Date: Thu, 9 May 2024 12:54:24 -0400 Subject: [PATCH 10/10] Implement #1404 (#1429) --- src/i18n/locales/en/translation.json | 2 +- src/i18n/locales/jp/translation.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json index 008cc879..05fccda6 100644 --- a/src/i18n/locales/en/translation.json +++ b/src/i18n/locales/en/translation.json @@ -48,7 +48,7 @@ "start_web3_call": "Start a Web3 Call", "subscribe_login_link": "Log in", "subscribe_login_premium": "Already have Premium?", - "subscribe_login_text": "Trial brings 30 days of free access to Brave Talk Premium. After 30 days, the credit card you enter will be charged $7.00 US per month. Cancel any time.", + "subscribe_login_text": "Trial brings 7 days of free access to Brave Talk Premium. After 7 days, the credit card you enter will be charged $7.00 US per month. Cancel any time.", "subscribe_text": "Host video calls with hundreds of people, get moderator controls, and more.", "talk_title": "Brave Talk", "talk_title_premium": "Brave Talk Premium", diff --git a/src/i18n/locales/jp/translation.json b/src/i18n/locales/jp/translation.json index 5e2c5c98..cd680982 100644 --- a/src/i18n/locales/jp/translation.json +++ b/src/i18n/locales/jp/translation.json @@ -47,7 +47,7 @@ "start_web3_call": "Web3通話を開始する", "subscribe_login_link": "ログイン", "subscribe_login_premium": "すでにプレミアムプランを購入していますか？", - "subscribe_login_text": "30日間Brave Talkプレミアムを無料で試してみましょう。30日後、登録されたクレジットカードに毎月7ドルが請求されます。解約はいつでも可能です。", + "subscribe_login_text": "7日間Brave Talkプレミアムを無料で試してみましょう。7日後、登録されたクレジットカードに毎月7ドルが請求されます。解約はいつでも可能です。", "subscribe_text": "大人数が参加可能なビデオ通話を行うには、プランのアップグレードが必要です。", "talk_title": "Brave Talk", "talk_title_premium": "Brave Talk プレミアム",