Merge pull request #63 from ba-st/gemstone64

Add support for Gemstone 64
ba-st · Feb 28, 2024 · e927abf · e927abf
2 parents 0e14bb6 + e3267b0
commit e927abf
Show file tree

Hide file tree

Showing 87 changed files with 1,032 additions and 579 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -1,13 +1,14 @@
 name: Integration Tests
-
-on: [push,pull_request,workflow_dispatch]
-
+on:
+  - push
+  - pull_request
+  - workflow_dispatch
 jobs:
    integration-tests:
     runs-on: ubuntu-latest
     name: Integration Tests
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Run tests using Docker

diff --git a/.github/workflows/loading-groups.yml b/.github/workflows/loading-groups.yml
@@ -1,18 +1,27 @@
 name: Baseline groups
-
-on: [push,pull_request,workflow_dispatch]
-
+on:
+  - push
+  - pull_request
+  - workflow_dispatch
 jobs:
    build:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0 ]
-        load-spec: [ core, api-client, service-discovery, deployment, examples, dependent-sunit-extensions]
+        smalltalk:
+          - Pharo64-11
+          - Pharo64-10
+        load-spec:
+          - core
+          - api-client
+          - service-discovery
+          - deployment
+          - examples
+          - dependent-sunit-extensions
     name: ${{ matrix.smalltalk }} + ${{ matrix.load-spec }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: hpi-swa/setup-smalltalkCI@v1
         with:
           smalltalk-image: ${{ matrix.smalltalk }}

diff --git a/.github/workflows/loading-gs64-components.yml b/.github/workflows/loading-gs64-components.yml
@@ -0,0 +1,24 @@
+name: 'GS64 Components Loading'
+on:
+  - push
+  - pull_request
+  - workflow_dispatch
+jobs:
+   component-loading:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        load-spec:
+          - Core
+          - API-Client
+          - Dependent-SUnit-Extensions
+          - Service-Discovery
+    name: GS64 + ${{ matrix.load-spec }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Load component in image
+        uses: ba-st-actions/gs64-ci@v2
+        with:
+          project_name: 'Superluminal'
+          load_spec: 'Superluminal-${{ matrix.load-spec }}'
diff --git 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@v2
+      - uses: actions/checkout@v4
       - name: markdownlint
         uses: reviewdog/action-markdownlint@v0
         with:

diff --git a/.github/workflows/unit-tests-gs64.yml b/.github/workflows/unit-tests-gs64.yml
@@ -0,0 +1,24 @@
+name: 'GS64 Unit Tests'
+on:
+  - push
+  - pull_request
+  - workflow_dispatch
+jobs:
+  unit-tests:
+    runs-on: ubuntu-latest
+    name: GS64 Unit Tests
+    services:
+      httpbin:
+        image: fortizpenaloza/httpbin
+      memcached:
+        image: memcached:1.6.7-alpine
+    steps:
+      - uses: actions/checkout@v4
+      - name: Load Image and Run Tests
+        uses: ba-st-actions/gs64-ci@v2
+        with:
+          project_name: 'Superluminal'
+          run_tests: 'true'
+        env:
+          CI_MEMCACHED_HOSTNAME: memcached
+          CI_HTTPBIN_HOSTNAME: httpbin
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -1,20 +1,28 @@
 name: Unit Tests
-
-on: [push,pull_request,workflow_dispatch]
-
+on:
+  - push
+  - pull_request
+  - workflow_dispatch
 jobs:
    unit-tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-8.0, Pharo64-9.0 ]
+        smalltalk:
+          - Pharo64-11
+          - Pharo64-10
     name: ${{ matrix.smalltalk }}
+    services:
+      httpbin:
+        image: fortizpenaloza/httpbin
+        ports:
+          - 127.0.0.1:80:80
+      memcached:
+        image: memcached:1.6.7-alpine
+        ports:
+          - 127.0.0.1:11211:11211
     steps:
-      - uses: actions/checkout@v3
-      - name: Start httpbin
-        run: docker run -d -p 127.0.0.1:80:80 fortizpenaloza/httpbin
-      - name: Start memcached
-        run: docker run -d -p 127.0.0.1:11211:11211 memcached:1.6.7-alpine
+      - uses: actions/checkout@v4
       - uses: hpi-swa/setup-smalltalkCI@v1
         with:
           smalltalk-image: ${{ matrix.smalltalk }}

diff --git a/api-tests/Dockerfile b/api-tests/Dockerfile
@@ -7,16 +7,11 @@ RUN pharo metacello install gitlocal://. BaselineOfSuperluminal --groups=Example
 
 # Stage 2: Copy the resulting Pharo.image with our project loaded
 # into a new docker image with just the vm
-FROM ghcr.io/ba-st/launchpad:v4
+FROM ghcr.io/ba-st/launchpad:v5
 
-USER root
+COPY --from=loader --chown=pharo:users /opt/pharo/Pharo.image ./
+COPY --from=loader --chown=pharo:users /opt/pharo/Pharo*.sources ./
 
-COPY --from=loader /opt/pharo/Pharo.image ./
-COPY --from=loader /opt/pharo/Pharo*.sources ./
-
-RUN mkdir logs \
-  && chown --recursive pharo:users /opt/pharo
-
-USER pharo
+RUN mkdir logs
 
 CMD ["launchpad-start", "superluminal-service-discovery", "--retry-delay-in-ms=10000"]
diff --git a/rowan/components/API-Client.ston b/rowan/components/API-Client.ston
@@ -0,0 +1,23 @@
+RwSimpleProjectLoadComponentV2 {
+  #name : 'API-Client',
+  #projectNames : [
+    'Memcached'
+  ],
+  #componentNames : [
+    'Core'
+  ],
+  #packageNames : [
+    'Superluminal-RESTfulAPI',
+    'Superluminal-RESTfulAPI-Extensions'
+  ],
+  #conditionalPackageMapSpecs : {
+    'gemstone' : {
+      'allusers' : {
+        #packageNameToPlatformPropertiesMap : {
+          'Superluminal-RESTfulAPI' : { 'symbolDictName' : 'Superluminal' },
+          'Superluminal-RESTfulAPI-Extensions' : { 'symbolDictName' : 'Zinc' }
+        }
+      }
+    }
+  }
+}
diff --git a/rowan/components/Core.ston b/rowan/components/Core.ston
@@ -0,0 +1,21 @@
+RwSimpleProjectLoadComponentV2 {
+  #name : 'Core',
+  #projectNames : [
+    'Hyperspace'
+  ],
+  #componentNames : [ ],
+  #packageNames : [
+    'Superluminal-Model',
+    'Superluminal-Model-Extensions'
+  ],
+  #conditionalPackageMapSpecs : {
+    'gemstone' : {
+      'allusers' : {
+        #packageNameToPlatformPropertiesMap : {
+          'Superluminal-Model' : { 'symbolDictName' : 'Superluminal' },
+          'Superluminal-Model-Extensions' : { 'symbolDictName' : 'Globals' }
+        }
+      }
+    }
+  }
+}
diff --git a/rowan/components/Dependent-SUnit-Extensions.ston b/rowan/components/Dependent-SUnit-Extensions.ston
@@ -0,0 +1,22 @@
+RwSimpleProjectLoadComponentV2 {
+  #name : 'Dependent-SUnit-Extensions',
+  #condition : 'sunit',
+  #projectNames : [
+    'Teachable'
+  ],
+  #componentNames : [
+    'Core'
+  ],
+  #packageNames : [
+    'Superluminal-SUnit-Model'
+  ],
+  #conditionalPackageMapSpecs : {
+    'gemstone' : {
+      'allusers' : {
+        #packageNameToPlatformPropertiesMap : {
+          'Superluminal-SUnit-Model' : { 'symbolDictName' : 'Superluminal' }
+        }
+      }
+    }
+  }
+}
diff --git a/rowan/components/Service-Discovery.ston b/rowan/components/Service-Discovery.ston
@@ -0,0 +1,19 @@
+RwSimpleProjectLoadComponentV2 {
+  #name : 'Service-Discovery',
+  #projectNames : [ ],
+  #componentNames : [
+    'API-Client'
+  ],
+  #packageNames : [
+    'Superluminal-Service-Discovery'
+  ],
+  #conditionalPackageMapSpecs : {
+    'gemstone' : {
+      'allusers' : {
+        #packageNameToPlatformPropertiesMap : {
+          'Superluminal-Service-Discovery' : { 'symbolDictName' : 'Superluminal' }
+        }
+      }
+    }
+  }
+}
diff --git a/rowan/components/Tests.ston b/rowan/components/Tests.ston
@@ -0,0 +1,29 @@
+RwSimpleProjectLoadComponentV2 {
+  #name : 'Tests',
+  #condition : 'tests',
+  #projectNames : [
+    'Teapot'
+  ],
+  #componentNames : [
+    'Service-Discovery',
+    'Dependent-SUnit-Extensions'
+  ],
+  #packageNames : [
+    'Superluminal-Model-Tests',
+    'Superluminal-Model-Tests-Extensions',
+    'Superluminal-RESTfulAPI-Tests',
+    'Superluminal-Service-Discovery-Tests'
+  ],
+  #conditionalPackageMapSpecs : {
+    'gemstone' : {
+      'allusers' : {
+        #packageNameToPlatformPropertiesMap : {
+          'Superluminal-Model-Tests' : { 'symbolDictName' : 'Superluminal' },
+          'Superluminal-Model-Tests-Extensions' : { 'symbolDictName' : 'Globals' },
+          'Superluminal-RESTfulAPI-Tests' : { 'symbolDictName' : 'Superluminal' },
+          'Superluminal-Service-Discovery-Tests' : { 'symbolDictName' : 'Superluminal' }
+        }
+      }
+    }
+  }
+}
diff --git a/rowan/project.ston b/rowan/project.ston
@@ -0,0 +1,10 @@
+RwProjectSpecificationV2 {
+  #specName : 'project',
+  #projectSpecPath : 'rowan',
+  #componentsPath : 'rowan/components',
+  #packagesPath : 'source',
+  #projectsPath : 'rowan/projects',
+  #specsPath : 'rowan/specs',
+  #packageFormat : 'tonel',
+  #packageConvention : 'Rowan'
+}
diff --git a/rowan/projects/Hyperspace.ston b/rowan/projects/Hyperspace.ston
@@ -0,0 +1,11 @@
+RwLoadSpecificationV2 {
+  #specName: 'Hyperspace',
+  #projectName : 'Hyperspace',
+  #gitUrl : 'https://github.com/ba-st/Hyperspace.git',
+  #revision : 'v5',
+  #projectSpecFile : 'rowan/project.ston',
+  #componentNames : [
+    'Deployment',
+    'Dependent-SUnit-Extensions'
+  ]
+}
diff --git a/rowan/projects/Memcached.ston b/rowan/projects/Memcached.ston
@@ -0,0 +1,10 @@
+RwLoadSpecificationV2 {
+  #specName: 'Memcached',
+  #projectName : 'Memcached',
+  #gitUrl : 'https://github.com/ba-st-dependencies/Memcached.git',
+  #revision : 'v2',
+  #projectSpecFile : 'rowan/project.ston',
+  #componentNames : [
+    'Deployment'
+  ]
+}
diff --git a/rowan/projects/Teachable.ston b/rowan/projects/Teachable.ston
@@ -0,0 +1,10 @@
+RwLoadSpecificationV2 {
+  #specName: 'Teachable',
+  #projectName : 'Teachable',
+  #gitUrl : 'https://github.com/ba-st-dependencies/Teachable.git',
+  #revision : 'v3',
+  #projectSpecFile : 'rowan/project.ston',
+  #componentNames : [
+    'Core'
+  ]
+}
diff --git a/rowan/projects/Teapot.ston b/rowan/projects/Teapot.ston
@@ -0,0 +1,10 @@
+RwLoadSpecificationV2 {
+  #specName: 'Teapot',
+  #projectName : 'Teapot',
+  #gitUrl : 'https://github.com/ba-st-dependencies/Teapot.git',
+  #revision : 'v2',
+  #projectSpecFile : 'rowan/project.ston',
+  #componentNames : [
+    'Deployment'
+  ]
+}
diff --git a/rowan/specs/Superluminal-API-Client.ston b/rowan/specs/Superluminal-API-Client.ston
@@ -0,0 +1,10 @@
+RwLoadSpecificationV2 {
+  #specName: 'Superluminal-API-Client',
+  #projectName : 'Superluminal',
+  #diskUrl : 'Superluminal',
+  #projectSpecFile : 'rowan/project.ston',
+  #componentNames : [
+    'API-Client'
+  ],
+  #comment : 'Loading spec for API-Client'
+}
diff --git a/rowan/specs/Superluminal-CI.ston b/rowan/specs/Superluminal-CI.ston
@@ -0,0 +1,14 @@
+RwLoadSpecificationV2 {
+  #specName: 'Superluminal-CI',
+  #projectName : 'Superluminal',
+  #diskUrl : 'Superluminal',
+  #projectSpecFile : 'rowan/project.ston',
+  #componentNames : [
+    'Tests'
+  ],
+  #customConditionalAttributes : [
+    'tests',
+    'sunit'
+  ],
+  #comment : 'Loading spec for the continuous integration setup'
+}
diff --git a/rowan/specs/Superluminal-Core.ston b/rowan/specs/Superluminal-Core.ston
@@ -0,0 +1,10 @@
+RwLoadSpecificationV2 {
+  #specName: 'Superluminal-Core',
+  #projectName : 'Superluminal',
+  #diskUrl : 'Superluminal',
+  #projectSpecFile : 'rowan/project.ston',
+  #componentNames : [
+    'Core'
+  ],
+  #comment : 'Loading spec for Core'
+}