From 55fbc115853a527c26057839d17721d6d1c9832c Mon Sep 17 00:00:00 2001 From: MaximilianoTabacman Date: Tue, 9 Apr 2024 09:44:54 -0300 Subject: [PATCH 1/4] Changed GS version to 3.7.1 --- .github/workflows/docker-build.yml | 2 +- examples/docker-compose-gem.build.yml | 4 ++-- examples/docker-compose-gem.yml | 4 ++-- examples/docker-compose.build.yml | 4 ++-- examples/docker-compose.yml | 2 +- source/Dockerfile | 1 + source/Rowan.gs | 23 ----------------------- source/configure.sh | 2 +- source/load-rowan-project.sh | 4 ++-- source/run-tests.sh | 4 ++-- 10 files changed, 14 insertions(+), 36 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 824eee1..fc3a397 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: version: - - '3.7.0' + - '3.7.1' steps: - name: Checkout repository diff --git a/examples/docker-compose-gem.build.yml b/examples/docker-compose-gem.build.yml index 4a05190..be4d321 100644 --- a/examples/docker-compose-gem.build.yml +++ b/examples/docker-compose-gem.build.yml @@ -7,7 +7,7 @@ services: context: ../source target: docker-gs64-rowan args: - GS_VERSION: 3.7.0 + GS_VERSION: 3.7.1 cap_add: - CAP_SYS_RESOURCE environment: @@ -28,7 +28,7 @@ services: context: ../source target: docker-gs64-gem args: - GS_VERSION: 3.7.0 + GS_VERSION: 3.7.1 cap_add: - CAP_SYS_RESOURCE environment: diff --git a/examples/docker-compose-gem.yml b/examples/docker-compose-gem.yml index a2ee9e5..2294580 100644 --- a/examples/docker-compose-gem.yml +++ b/examples/docker-compose-gem.yml @@ -3,7 +3,7 @@ version: "3" services: stone: init: true - image: ghcr.io/ba-st/gs64-rowan:v3.7.0 + image: ghcr.io/ba-st/gs64-rowan:v3.7.1 cap_add: - CAP_SYS_RESOURCE environment: @@ -20,7 +20,7 @@ services: depends_on: stone: condition: service_started - image: ghcr.io/ba-st/gs64-gem:v3.7.0 + image: ghcr.io/ba-st/gs64-gem:v3.7.1 cap_add: - CAP_SYS_RESOURCE environment: diff --git a/examples/docker-compose.build.yml b/examples/docker-compose.build.yml index 50401da..cf16a48 100644 --- a/examples/docker-compose.build.yml +++ b/examples/docker-compose.build.yml @@ -1,4 +1,4 @@ -version: "3" +version: "3.8" services: stone: @@ -8,7 +8,7 @@ services: context: ../source target: docker-gs64-rowan args: - GS_VERSION: 3.7.0 + GS_VERSION: 3.7.1 cap_add: - CAP_SYS_RESOURCE environment: diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml index 2ca9235..8fee685 100644 --- a/examples/docker-compose.yml +++ b/examples/docker-compose.yml @@ -4,7 +4,7 @@ services: stone: init: true network_mode: host - image: ghcr.io/ba-st/gs64-rowan:v3.7.0 + image: ghcr.io/ba-st/gs64-rowan:v3.7.1 cap_add: - CAP_SYS_RESOURCE environment: diff --git a/source/Dockerfile b/source/Dockerfile index 986613f..9966e4e 100644 --- a/source/Dockerfile +++ b/source/Dockerfile @@ -54,6 +54,7 @@ RUN rm -rf \ ${GEMSTONE}/lib32/ \ ${GEMSTONE}/projects/ \ ${GEMSTONE}/rowan/ \ + ${GEMSTONE}/rowan3/ \ ${GEMSTONE}/seaside/ \ ${GEMSTONE}/upgrade/ \ ${GEMSTONE}/bin/vsd* \ diff --git a/source/Rowan.gs b/source/Rowan.gs index c3e4fdd..e69de29 100644 --- a/source/Rowan.gs +++ b/source/Rowan.gs @@ -1,23 +0,0 @@ -fileformat utf8 -set compile_env: 0 -category: 'accessing' -method: RwDefinitionSetDefinition -addDefinition: aDefinition - - definitions at: aDefinition key put: aDefinition -% -category: 'initialize-release' -method: STONWriter -jsonMode: boolean - - jsonMode := boolean. - jsonMode - ifTrue: [ - STONCharacters - at: $' codePoint + 1 put: #pass; - at: $" codePoint + 1 put: '\"' ] - ifFalse: [ - STONCharacters - at: $" codePoint + 1 put: #pass; - at: $' codePoint + 1 put: '\''' ] -% diff --git a/source/configure.sh b/source/configure.sh index 38e66f1..6197fe1 100755 --- a/source/configure.sh +++ b/source/configure.sh @@ -7,7 +7,7 @@ readonly SYSTEM_USER_PASSWORD="${GS64_SYSTEM_USER_PASSWORD:-swordfish}" echo "Configuring GS Repository..." topaz -i -q < "${GEMSTONE_LOG_DIR}/configuring-repository.log" -set gemstone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD} +set stone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD} iferror exit 1 login doit diff --git a/source/load-rowan-project.sh b/source/load-rowan-project.sh index b75790b..d83406e 100755 --- a/source/load-rowan-project.sh +++ b/source/load-rowan-project.sh @@ -24,7 +24,7 @@ touch "${GEMSTONE_LOG_DIR}/loading-rowan-projects.log" echo "Installing Rowan fixes" topaz -i -q < "${GEMSTONE_LOG_DIR}/installing-rowan-fixes.log" -set gemstone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD} +set stone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD} iferror exit 1 login input Rowan.gs @@ -38,7 +38,7 @@ echo " Project Name: ${LRP_PROJECT_NAME}" echo " Load Spec: ${LRP_LOAD_SPEC}" topaz -i -q < "${GEMSTONE_LOG_DIR}/loading-rowan-projects.log" -set gemstone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD} +set stone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD} iferror exit 1 login doit diff --git a/source/run-tests.sh b/source/run-tests.sh index 7e3bf67..0ec1ba0 100755 --- a/source/run-tests.sh +++ b/source/run-tests.sh @@ -12,7 +12,7 @@ touch "${GEMSTONE_LOG_DIR}/running-tests.log" echo "Installing stdout printer & test reporter" topaz -i -q < "${GEMSTONE_LOG_DIR}/installing-stdout-support.log" -set gemstone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD} +set stone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD} iferror exit 1 login input StdOutPrinter.gs @@ -25,7 +25,7 @@ EOF echo "Running test suite" topaz -i -q < "${GEMSTONE_LOG_DIR}/running-tests.log" -set gemstone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD} +set stone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD} iferror exit 1 login expectvalue true From 1cff69c83fe374a430e67ff43d5cd410fa45a1e9 Mon Sep 17 00:00:00 2001 From: MaximilianoTabacman Date: Tue, 9 Apr 2024 11:07:45 -0300 Subject: [PATCH 2/4] Additional corrections --- source/Dockerfile | 1 + source/Rowan.gs | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/source/Dockerfile b/source/Dockerfile index 9966e4e..578590b 100644 --- a/source/Dockerfile +++ b/source/Dockerfile @@ -202,6 +202,7 @@ RUN rm -rf \ ${GEMSTONE}/bin/stoplogsender \ ${GEMSTONE}/bin/stopstone \ ${GEMSTONE}/bin/superdoit_baseimage_solo \ + ${GEMSTONE}/bin/superdoit_rowan3_solo \ ${GEMSTONE}/bin/superdoit_solo \ ${GEMSTONE}/bin/superdoit_stone \ ${GEMSTONE}/bin/updatesecuredbf \ diff --git a/source/Rowan.gs b/source/Rowan.gs index e69de29..78e794a 100644 --- a/source/Rowan.gs +++ b/source/Rowan.gs @@ -0,0 +1,23 @@ +fileformat utf8 +set compile_env: 0 +category: 'accessing' +method: RwDefinitionSetDefinition +addDefinition: aDefinition + + definitions at: aDefinition key put: aDefinition +% +category: 'initialize-release' +method: STONWriter +jsonMode: boolean + + jsonMode := boolean. + jsonMode + ifTrue: [ + STONCharacters + at: $' codePoint + 1 put: #pass; + at: $" codePoint + 1 put: '\"' ] + ifFalse: [ + STONCharacters + at: $" codePoint + 1 put: #pass; + at: $' codePoint + 1 put: '\''' ] +% \ No newline at end of file From 9793835feb10dce14920ef61fc719d58993f1331 Mon Sep 17 00:00:00 2001 From: MaximilianoTabacman Date: Tue, 9 Apr 2024 11:27:03 -0300 Subject: [PATCH 3/4] Added newline --- source/Rowan.gs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Rowan.gs b/source/Rowan.gs index 78e794a..c3e4fdd 100644 --- a/source/Rowan.gs +++ b/source/Rowan.gs @@ -20,4 +20,4 @@ jsonMode: boolean STONCharacters at: $" codePoint + 1 put: #pass; at: $' codePoint + 1 put: '\''' ] -% \ No newline at end of file +% From 602409b92d260e2e8168d380bb67a2011bc5e20e Mon Sep 17 00:00:00 2001 From: Gabriel Omar Cotelli Date: Tue, 9 Apr 2024 11:57:55 -0300 Subject: [PATCH 4/4] Update checkout action to v4 Improve Dockerfile --- .github/workflows/docker-build.yml | 2 +- .github/workflows/markdown-lint.yml | 7 +++++-- .github/workflows/shellcheck.yml | 8 ++++---- LICENSE | 2 +- examples/docker-compose-gem.build.yml | 2 +- examples/docker-compose-gem.yml | 2 +- examples/docker-compose.yml | 2 +- source/Dockerfile | 14 +++++++------- source/run-tests.sh | 1 + 9 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index fc3a397..579b5ef 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/.github/workflows/markdown-lint.yml b/.github/workflows/markdown-lint.yml index fbb50fa..84e4633 100644 --- a/.github/workflows/markdown-lint.yml +++ b/.github/workflows/markdown-lint.yml @@ -1,11 +1,14 @@ name: Markdown Lint -on: [push,pull_request,workflow_dispatch] +on: + - push + - pull_request + - workflow_dispatch jobs: remark-lint: name: runner / markdownlint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: markdownlint uses: reviewdog/action-markdownlint@v0 with: diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index dabaf41..ee481ff 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -1,12 +1,12 @@ name: 'Shellcheck' - -on: [push,pull_request] - +on: + - push + - pull_request] jobs: shellcheck: runs-on: 'ubuntu-latest' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: 'Run Shellcheck' uses: reviewdog/action-shellcheck@v1 with: diff --git a/LICENSE b/LICENSE index 0bb2dda..5aef93f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 Buenos Aires Smalltalk +Copyright (c) 2023-2024 Buenos Aires Smalltalk Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/examples/docker-compose-gem.build.yml b/examples/docker-compose-gem.build.yml index be4d321..9ead9ff 100644 --- a/examples/docker-compose-gem.build.yml +++ b/examples/docker-compose-gem.build.yml @@ -1,4 +1,4 @@ -version: "3" +version: "3.8" services: stone: diff --git a/examples/docker-compose-gem.yml b/examples/docker-compose-gem.yml index 2294580..3d3bac6 100644 --- a/examples/docker-compose-gem.yml +++ b/examples/docker-compose-gem.yml @@ -1,4 +1,4 @@ -version: "3" +version: "3.8" services: stone: diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml index 8fee685..c8e4149 100644 --- a/examples/docker-compose.yml +++ b/examples/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: "3.8" services: stone: diff --git a/source/Dockerfile b/source/Dockerfile index 578590b..d79680e 100644 --- a/source/Dockerfile +++ b/source/Dockerfile @@ -47,6 +47,12 @@ RUN mkdir - ${GEMSTONE_GLOBAL_DIR} \ # Remove non-essential files to keep the final image size small RUN rm -rf \ + ${GEMSTONE}/bin/gemsetup.csh \ + ${GEMSTONE}/bin/slow \ + ${GEMSTONE}/bin/superdoit_baseimage_solo \ + ${GEMSTONE}/bin/superdoit_rowan3_solo \ + ${GEMSTONE}/bin/superdoit_solo \ + ${GEMSTONE}/bin/superdoit_stone \ ${GEMSTONE}/bin32/ \ ${GEMSTONE}/examples/ \ ${GEMSTONE}/include/ \ @@ -65,6 +71,7 @@ RUN rm -rf \ ${GEMSTONE}/lib/pkgconfig/tk* \ ${GEMSTONE}/lib/rbc* \ ${GEMSTONE}/doc/man1/vsd.1 \ + ${GEMSTONE}/sys/topazSolo.ini \ && mv ${GEMSTONE}/bin/extent0*.dbf ${DOWNLOAD_LOCATION} \ ; @@ -185,14 +192,12 @@ FROM download as minimal-download # Remove non-essential files to keep the final image size small RUN rm -rf \ ${GEMSTONE}/bin/copydbf \ - ${GEMSTONE}/bin/gemsetup.csh \ ${GEMSTONE}/bin/gemstone_data.conf \ ${GEMSTONE}/bin/pageaudit \ ${GEMSTONE}/bin/printlogs \ ${GEMSTONE}/bin/removedbf \ ${GEMSTONE}/bin/searchlogs \ ${GEMSTONE}/bin/secure_backup_extract \ - ${GEMSTONE}/bin/slow \ ${GEMSTONE}/bin/starthostagent \ ${GEMSTONE}/bin/startlogreceiver \ ${GEMSTONE}/bin/startlogsender \ @@ -201,10 +206,6 @@ RUN rm -rf \ ${GEMSTONE}/bin/stoplogreceiver \ ${GEMSTONE}/bin/stoplogsender \ ${GEMSTONE}/bin/stopstone \ - ${GEMSTONE}/bin/superdoit_baseimage_solo \ - ${GEMSTONE}/bin/superdoit_rowan3_solo \ - ${GEMSTONE}/bin/superdoit_solo \ - ${GEMSTONE}/bin/superdoit_stone \ ${GEMSTONE}/bin/updatesecuredbf \ ${GEMSTONE}/bin/upgradeimage \ ${GEMSTONE}/bin/verify_backup_with_openssl \ @@ -232,7 +233,6 @@ RUN rm -rf \ ${GEMSTONE}/sys/midhostagenttopaz.ini \ ${GEMSTONE}/sys/runpageauditgem \ ${GEMSTONE}/sys/stoned \ - ${GEMSTONE}/sys/topazSolo.ini \ ; ###################### diff --git a/source/run-tests.sh b/source/run-tests.sh index 0ec1ba0..5583354 100755 --- a/source/run-tests.sh +++ b/source/run-tests.sh @@ -14,6 +14,7 @@ echo "Installing stdout printer & test reporter" topaz -i -q < "${GEMSTONE_LOG_DIR}/installing-stdout-support.log" set stone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD} iferror exit 1 +fileformat utf8 login input StdOutPrinter.gs input StdOutTestReporter.gs