From a90b3697902fe31c05072c19c8e0eb8794228380 Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com> Date: Fri, 8 Nov 2024 14:56:02 -0800 Subject: [PATCH 1/4] ci: add job to push Transifex strings --- .github/workflows/tx-push.yml | 26 ++++++++++++++++++++++++++ bin/tx-push-www | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/tx-push.yml diff --git a/.github/workflows/tx-push.yml b/.github/workflows/tx-push.yml new file mode 100644 index 000000000..c79ba2cc8 --- /dev/null +++ b/.github/workflows/tx-push.yml @@ -0,0 +1,26 @@ +name: Transifex Push + +on: + push: # Runs whenever a commit is pushed to the repository + branches: [master, develop, release/*] # ...on any of these branches + workflow_dispatch: # Allows you to run this workflow manually from the Actions tab + +jobs: + transifex-push: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4 + with: + cache: 'npm' + node-version-file: '.nvmrc' + - name: info + run: | + echo "Scratch environment: ${{ vars.SCRATCH_ENV }}" + echo "Node version: $(node --version)" + echo "NPM version: $(npm --version)" + - run: npm ci + - name: push strings to Transifex + run: npm run i18n:push --execute + env: + TX_TOKEN: ${{ secrets.TX_TOKEN }} diff --git a/bin/tx-push-www b/bin/tx-push-www index c87f3a6f2..681e03ef9 100755 --- a/bin/tx-push-www +++ b/bin/tx-push-www @@ -69,7 +69,7 @@ glob('src/views/**/l10n.json', {}, function (er, files) { let cmd; resources.forEach(resource => { - cmd = `$(npm bin)/tx-push-src scratch-website ${resource.resourceName} ${resource.filename}`; + cmd = `tx-push-src scratch-website ${resource.resourceName} ${resource.filename}`; if (execute) { // push all the source files to transifex - force update process.stdout.write(`running command: ${cmd}\n`); From e7ce0ff31c57c9d837eb3a1184aa962558905269 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 11:44:01 +0000 Subject: [PATCH 2/4] fix(deps): update dependency scratch-l10n to v4.0.22 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 19c3efdf1..012dbc812 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.80.6", "sass-loader": "10.5.2", "scratch-gui": "4.1.2", - "scratch-l10n": "4.0.20", + "scratch-l10n": "4.0.22", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22461,9 +22461,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.20", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.20.tgz", - "integrity": "sha512-jysbWbGt3wQO1q1wftyN1wqDeLpMPRaOUrGbtiI2hBFy9QQGhWbmmrrNYqtP1MxEkXdW12FZYDDdNu2K+Mn8sg==", + "version": "4.0.22", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.22.tgz", + "integrity": "sha512-bhIy0FM+2gCcdNrifnuXskevSf90wyjdDnsm7XGr+jMMLyws75+Vo5p36LNZwvxztrFbQ21toNopl9f9VVw95w==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index 4f0b4060c..eed5e7ac0 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.80.6", "sass-loader": "10.5.2", "scratch-gui": "4.1.2", - "scratch-l10n": "4.0.20", + "scratch-l10n": "4.0.22", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From 74a60562ffae34b9a2a10607073661b62f180c80 Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com> Date: Tue, 12 Nov 2024 08:12:56 -0800 Subject: [PATCH 3/4] ci: print more info in the "info" step --- .github/workflows/ci-cd.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 14700e82f..d57b586df 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -47,9 +47,15 @@ jobs: node-version-file: '.nvmrc' - name: info run: | - echo "Scratch environment: ${{ vars.SCRATCH_ENV }}" - echo "Node version: $(node --version)" - echo "NPM version: $(npm --version)" + cat < Date: Wed, 13 Nov 2024 12:10:16 +0000 Subject: [PATCH 4/4] fix(deps): update dependency scratch-l10n to v4.0.24 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 012dbc812..af798c21b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.80.6", "sass-loader": "10.5.2", "scratch-gui": "4.1.2", - "scratch-l10n": "4.0.22", + "scratch-l10n": "4.0.24", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22461,9 +22461,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.22", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.22.tgz", - "integrity": "sha512-bhIy0FM+2gCcdNrifnuXskevSf90wyjdDnsm7XGr+jMMLyws75+Vo5p36LNZwvxztrFbQ21toNopl9f9VVw95w==", + "version": "4.0.24", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.24.tgz", + "integrity": "sha512-8HoTKkTWGCUiXvYJmhdsEEei6PJ50Ffll3vgc5shSCgYhR1asSMRp1nYq80o7BJyT+0/FOXfPCheMv4+gPjBvw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index eed5e7ac0..04ff696db 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.80.6", "sass-loader": "10.5.2", "scratch-gui": "4.1.2", - "scratch-l10n": "4.0.22", + "scratch-l10n": "4.0.24", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0",