From 0ec4280fdce0ca42d7fa4ad9e67b8202d113991e Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Thu, 11 Jul 2024 17:35:53 -0400 Subject: [PATCH 01/10] update tc-source-content-updater --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index c51051c9d1..f860749b0f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "translationCore", - "version": "3.6.4", + "version": "3.6.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "translationCore", - "version": "3.6.4", + "version": "3.6.5", "license": "GPL-2.0", "dependencies": { "@craco/craco": "5.6.4", @@ -74,7 +74,7 @@ "string-punctuation-tokenizer": "^2.2.0", "sudo-prompt": "6.2.1", "tc-electron-env": "0.10.0", - "tc-source-content-updater": "1.4.24", + "tc-source-content-updater": "1.4.25-beta.4", "tc-strings": "0.1.7", "tc-tool": "4.1.0", "tc-ui-toolkit": "6.2.9", @@ -24454,9 +24454,9 @@ } }, "node_modules/tc-source-content-updater": { - "version": "1.4.24", - "resolved": "https://registry.npmjs.org/tc-source-content-updater/-/tc-source-content-updater-1.4.24.tgz", - "integrity": "sha512-7/zk3kSieuhhdiAHz0jXsel+gSEQaqF/rIqF+/n2ZvdmlZvAS+YrNJIcIxCSt7zl/rrGLoYOgSp1RPiFluQgJA==", + "version": "1.4.25-beta.4", + "resolved": "https://registry.npmjs.org/tc-source-content-updater/-/tc-source-content-updater-1.4.25-beta.4.tgz", + "integrity": "sha512-pVOPCQGShtmraRjTISeDd5Q5FTOR6LEf4zqPubXzH8YP1lbI7YiYz8HlPCvO5kbWe9AuvzTDIqGA2as/W7lVDA==", "dependencies": { "adm-zip": "^0.4.11", "agentkeepalive": "4.1.0", @@ -47861,9 +47861,9 @@ } }, "tc-source-content-updater": { - "version": "1.4.24", - "resolved": "https://registry.npmjs.org/tc-source-content-updater/-/tc-source-content-updater-1.4.24.tgz", - "integrity": "sha512-7/zk3kSieuhhdiAHz0jXsel+gSEQaqF/rIqF+/n2ZvdmlZvAS+YrNJIcIxCSt7zl/rrGLoYOgSp1RPiFluQgJA==", + "version": "1.4.25-beta.4", + "resolved": "https://registry.npmjs.org/tc-source-content-updater/-/tc-source-content-updater-1.4.25-beta.4.tgz", + "integrity": "sha512-pVOPCQGShtmraRjTISeDd5Q5FTOR6LEf4zqPubXzH8YP1lbI7YiYz8HlPCvO5kbWe9AuvzTDIqGA2as/W7lVDA==", "requires": { "adm-zip": "^0.4.11", "agentkeepalive": "4.1.0", diff --git a/package.json b/package.json index 726a8c2ce1..f873ce554b 100644 --- a/package.json +++ b/package.json @@ -186,7 +186,7 @@ "string-punctuation-tokenizer": "^2.2.0", "sudo-prompt": "6.2.1", "tc-electron-env": "0.10.0", - "tc-source-content-updater": "1.4.24", + "tc-source-content-updater": "1.4.25-beta.4", "tc-strings": "0.1.7", "tc-tool": "4.1.0", "tc-ui-toolkit": "6.2.9", From 8ad712bf74490e4fba042e297afbfe7bf340aaa5 Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Thu, 11 Jul 2024 17:58:30 -0400 Subject: [PATCH 02/10] update node version for linux --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d774e44708..d5b2fc3c77 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -137,7 +137,7 @@ jobs: steps: - uses: actions/setup-node@v1 with: - node-version: '16.4.2' + node-version: '16.14.2' - name: TRIM setting run: echo "Trim value is $TRIM" From 503783ac2c5026716ee2939d1dc5611fb34bd0ee Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Thu, 11 Jul 2024 21:26:00 -0400 Subject: [PATCH 03/10] change actions runner to run on ubuntu-20.04 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d5b2fc3c77..1a362b1ea2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -125,7 +125,7 @@ jobs: matrix: trim: [ 0, 1 ] needs: test - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: neutrinog/concourse-tasks:latest env: TC_HELP_DESK_TOKEN: ${{ secrets.TC_HELP_DESK_TOKEN }} From 547047b8a4510e26a3d08ec94cba2a9ec266af81 Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Thu, 11 Jul 2024 22:37:41 -0400 Subject: [PATCH 04/10] change actions runner to run on ubuntu-18.04 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1a362b1ea2..3c18445432 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -125,7 +125,7 @@ jobs: matrix: trim: [ 0, 1 ] needs: test - runs-on: ubuntu-20.04 + runs-on: ubuntu-18.04 container: neutrinog/concourse-tasks:latest env: TC_HELP_DESK_TOKEN: ${{ secrets.TC_HELP_DESK_TOKEN }} From cfe6c1aef55cc5631ca9b416bdf66d0edbc6fc31 Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Fri, 12 Jul 2024 06:16:08 -0400 Subject: [PATCH 05/10] updated docker --- .github/workflows/docker/Dockerfile | 4 ++-- .github/workflows/main.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker/Dockerfile b/.github/workflows/docker/Dockerfile index e94e1a51f9..2e70cc711b 100644 --- a/.github/workflows/docker/Dockerfile +++ b/.github/workflows/docker/Dockerfile @@ -4,7 +4,7 @@ # sudo docker tag github_build /github_build:latest # sudo docker push /github_build:latest -FROM node:16.4.2 +FROM node:16.14.2 ARG DEBIAN_FRONTEND=noninteractive @@ -14,7 +14,7 @@ RUN dpkg --add-architecture i386 && \ apt-get install -yq locales git zip unzip genisoimage wine wine32 wine64 libwine libwine:i386 innoextract software-properties-common # install npm -RUN npm install -g npm@7.18.1 +RUN npm install -g npm@8.5.0 # install inno setup RUN mkdir /tmp/inno && \ diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3c18445432..1a362b1ea2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -125,7 +125,7 @@ jobs: matrix: trim: [ 0, 1 ] needs: test - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 container: neutrinog/concourse-tasks:latest env: TC_HELP_DESK_TOKEN: ${{ secrets.TC_HELP_DESK_TOKEN }} From 69c805406ba1058f2518ec1846204b7f788f2056 Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Fri, 12 Jul 2024 07:49:23 -0400 Subject: [PATCH 06/10] reverted docker changes and rebuilt docker image --- .github/workflows/docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker/Dockerfile b/.github/workflows/docker/Dockerfile index 2e70cc711b..3141b1b382 100644 --- a/.github/workflows/docker/Dockerfile +++ b/.github/workflows/docker/Dockerfile @@ -1,10 +1,10 @@ -# Build commands +# Build commands (run docker on x64 machine or emulated x64): # sudo docker login -u # sudo docker build -t github_build . # sudo docker tag github_build /github_build:latest # sudo docker push /github_build:latest -FROM node:16.14.2 +FROM node:16.4.2 ARG DEBIAN_FRONTEND=noninteractive @@ -14,7 +14,7 @@ RUN dpkg --add-architecture i386 && \ apt-get install -yq locales git zip unzip genisoimage wine wine32 wine64 libwine libwine:i386 innoextract software-properties-common # install npm -RUN npm install -g npm@8.5.0 +RUN npm install -g npm@7.18.1 # install inno setup RUN mkdir /tmp/inno && \ From 5f924d5365b6128dcaf545de2e067ec906aca5b9 Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Fri, 12 Jul 2024 08:02:30 -0400 Subject: [PATCH 07/10] fix build container --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1a362b1ea2..426199b577 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -125,8 +125,8 @@ jobs: matrix: trim: [ 0, 1 ] needs: test - runs-on: ubuntu-20.04 - container: neutrinog/concourse-tasks:latest + runs-on: ubuntu-latest + container: photonomad/concourse-tasks:latest env: TC_HELP_DESK_TOKEN: ${{ secrets.TC_HELP_DESK_TOKEN }} TC_HELP_DESK_EMAIL: ${{ secrets.TC_HELP_DESK_EMAIL }} From 81b9c535ee6faeab72cc56176c6934599b189915 Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Fri, 12 Jul 2024 08:14:27 -0400 Subject: [PATCH 08/10] fix build instructiong --- .github/workflows/main.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 426199b577..949bfa0cb5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: test: name: Test runs-on: ubuntu-latest - container: photonomad/github_build:latest + container: photonomad/concourse-tasks:latest # the Dockerfile used to create this image is here: ./.github/workflows/docker/Dockerfile env: CI: true @@ -142,10 +142,16 @@ jobs: - name: TRIM setting run: echo "Trim value is $TRIM" - - name: Node version + - name: Get version run: | + echo "node --version" node --version + echo "npm --version" npm --version + echo "git --version" + git --version + echo "pwd" + pwd # - uses: actions/checkout@v2 # - name: Checkout submodules From b3a6f17829442d8909943edbabc4af17fa2d5a56 Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Fri, 12 Jul 2024 08:21:23 -0400 Subject: [PATCH 09/10] fix build container name --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 949bfa0cb5..c92b69786f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: test: name: Test runs-on: ubuntu-latest - container: photonomad/concourse-tasks:latest + container: photonomad/github_build:latest # the Dockerfile used to create this image is here: ./.github/workflows/docker/Dockerfile env: CI: true @@ -126,7 +126,7 @@ jobs: trim: [ 0, 1 ] needs: test runs-on: ubuntu-latest - container: photonomad/concourse-tasks:latest + container: photonomad/github_build:latest env: TC_HELP_DESK_TOKEN: ${{ secrets.TC_HELP_DESK_TOKEN }} TC_HELP_DESK_EMAIL: ${{ secrets.TC_HELP_DESK_EMAIL }} From 4400964c11b515e96bf3f8ca945addaba6d8fe9f Mon Sep 17 00:00:00 2001 From: PhotoNomad0 Date: Fri, 12 Jul 2024 08:56:39 -0400 Subject: [PATCH 10/10] update tc-source-content-updater --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index f860749b0f..e7ccd67a7b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,7 +74,7 @@ "string-punctuation-tokenizer": "^2.2.0", "sudo-prompt": "6.2.1", "tc-electron-env": "0.10.0", - "tc-source-content-updater": "1.4.25-beta.4", + "tc-source-content-updater": "1.4.25", "tc-strings": "0.1.7", "tc-tool": "4.1.0", "tc-ui-toolkit": "6.2.9", @@ -24454,9 +24454,9 @@ } }, "node_modules/tc-source-content-updater": { - "version": "1.4.25-beta.4", - "resolved": "https://registry.npmjs.org/tc-source-content-updater/-/tc-source-content-updater-1.4.25-beta.4.tgz", - "integrity": "sha512-pVOPCQGShtmraRjTISeDd5Q5FTOR6LEf4zqPubXzH8YP1lbI7YiYz8HlPCvO5kbWe9AuvzTDIqGA2as/W7lVDA==", + "version": "1.4.25", + "resolved": "https://registry.npmjs.org/tc-source-content-updater/-/tc-source-content-updater-1.4.25.tgz", + "integrity": "sha512-BH4A8GHSeZRx6t3CHW2IKC4gaZbakEhz91AYb7AEIsE5XDN9klmgigurwfDAq6E/SBzPcHEQGKx9X9xjKzM2BA==", "dependencies": { "adm-zip": "^0.4.11", "agentkeepalive": "4.1.0", @@ -47861,9 +47861,9 @@ } }, "tc-source-content-updater": { - "version": "1.4.25-beta.4", - "resolved": "https://registry.npmjs.org/tc-source-content-updater/-/tc-source-content-updater-1.4.25-beta.4.tgz", - "integrity": "sha512-pVOPCQGShtmraRjTISeDd5Q5FTOR6LEf4zqPubXzH8YP1lbI7YiYz8HlPCvO5kbWe9AuvzTDIqGA2as/W7lVDA==", + "version": "1.4.25", + "resolved": "https://registry.npmjs.org/tc-source-content-updater/-/tc-source-content-updater-1.4.25.tgz", + "integrity": "sha512-BH4A8GHSeZRx6t3CHW2IKC4gaZbakEhz91AYb7AEIsE5XDN9klmgigurwfDAq6E/SBzPcHEQGKx9X9xjKzM2BA==", "requires": { "adm-zip": "^0.4.11", "agentkeepalive": "4.1.0", diff --git a/package.json b/package.json index f873ce554b..8ac2209ccf 100644 --- a/package.json +++ b/package.json @@ -186,7 +186,7 @@ "string-punctuation-tokenizer": "^2.2.0", "sudo-prompt": "6.2.1", "tc-electron-env": "0.10.0", - "tc-source-content-updater": "1.4.25-beta.4", + "tc-source-content-updater": "1.4.25", "tc-strings": "0.1.7", "tc-tool": "4.1.0", "tc-ui-toolkit": "6.2.9",