Merge a8d8ae7

ba-st · Jun 25, 2024 · 263277d · 263277d
2 parents 43c9f46 + a8d8ae7
commit 263277d
Show file tree

Hide file tree

Showing 39 changed files with 1,024 additions and 31 deletions.
diff --git a/.github/workflows/loading-groups.yml b/.github/workflows/loading-groups.yml
@@ -1,18 +1,26 @@
 name: Baseline Groups
-
-on: [push,pull_request,workflow_dispatch]
-
+on:
+  - push
+  - pull_request
+  - workflow_dispatch
 jobs:
    group-loading:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        smalltalk: [ Pharo64-10, Pharo64-9.0 ]
-        load-spec: [ deployment, dependent-sunit-extensions, tests, development ]
+        smalltalk:
+          - Pharo64-9.0
+          - Pharo64-10
+          - Pharo64-11
+        load-spec:
+          - dependent-sunit-extensions
+          - deployment
+          - development
+          - tests
     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,39 @@
+name: 'GS64 Components Loading'
+on:
+  - push
+  - pull_request
+  - workflow_dispatch
+
+jobs:
+   component-loading-3_7_0:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        load-spec:
+          - Dependent-SUnit-Extensions
+          - Deployment
+    name: GS64 v3.7.0 + ${{ matrix.load-spec }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Load component in image
+        uses: ba-st-actions/gs64-ci@v2
+        with:
+          project_name: 'Bell'
+          load_spec: 'Bell-${{ matrix.load-spec }}'
+   component-loading-3_7_1:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        load-spec:
+          - Dependent-SUnit-Extensions
+          - Deployment
+    name: GS64 v3.7.1 + ${{ matrix.load-spec }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Load component in image
+        uses: ba-st-actions/gs64-ci@v3
+        with:
+          project_name: 'Bell'
+          load_spec: 'Bell-${{ 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@v3
+      - uses: actions/checkout@v4
       - name: markdownlint
         uses: reviewdog/action-markdownlint@v0
         with:

diff --git a/.github/workflows/notify.yml b/.github/workflows/notify.yml
@@ -1,9 +1,5 @@
 name: Release Notifications
-
-on:
-  release:
-    types: [published]
-
+on: workflow_dispatch
 jobs:
   notify:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/unit-tests-gs64.yml b/.github/workflows/unit-tests-gs64.yml
@@ -0,0 +1,26 @@
+name: 'GS64 Unit Tests'
+on:
+  - push
+  - pull_request
+  - workflow_dispatch
+jobs:
+  unit-tests-3_7_0:
+    runs-on: ubuntu-latest
+    name: GS64 3.7.0 Unit Tests
+    steps:
+      - uses: actions/checkout@v4
+      - name: Load Image and Run Tests
+        uses: ba-st-actions/gs64-ci@v2
+        with:
+          project_name: 'Bell'
+          run_tests: 'true'
+  unit-tests-3_7_1:
+    runs-on: ubuntu-latest
+    name: GS64 3.7.1 Unit Tests
+    steps:
+      - uses: actions/checkout@v4
+      - name: Load Image and Run Tests
+        uses: ba-st-actions/gs64-ci@v3
+        with:
+          project_name: 'Bell'
+          run_tests: 'true'
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -1,16 +1,20 @@
-name: Unit Tests
-
-on: [push,pull_request,workflow_dispatch]
-
+name: Pharo Unit Tests
+on:
+  - push
+  - pull_request
+  - workflow_dispatch
 jobs:
    build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        smalltalk: [ Pharo64-10, Pharo64-9.0 ]
+        smalltalk:
+          - Pharo64-9.0
+          - Pharo64-10
+          - Pharo64-11
     name: ${{ matrix.smalltalk }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Smalltalk CI
         uses: hpi-swa/setup-smalltalkCI@v1
         with:
@@ -21,7 +25,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         timeout-minutes: 15
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           name: Unit-Tests-${{matrix.smalltalk}}
           token: ${{ secrets.CODECOV_TOKEN }}
+          flags: unit
diff --git a/.smalltalkci/loading.dependent-sunit-extensions.ston b/.smalltalkci/loading.dependent-sunit-extensions.ston
@@ -4,7 +4,8 @@ SmalltalkCISpec {
       #baseline : 'Bell',
       #directory : '../source',
       #load : [ 'Dependent-SUnit-Extensions' ],
-      #platforms : [  #pharo ]
+      #platforms : [  #pharo ] ,
+      #failOn : [ #Warning ]
     }
   ],
   #testing : {

diff --git a/.smalltalkci/loading.deployment.ston b/.smalltalkci/loading.deployment.ston
@@ -4,7 +4,8 @@ SmalltalkCISpec {
       #baseline : 'Bell',
       #directory : '../source',
       #load : [ 'Deployment' ],
-      #platforms : [  #pharo ]
+      #platforms : [  #pharo ],
+      #failOn : [ #Warning ]
     }
   ],
   #testing : {

diff --git a/.smalltalkci/loading.development.ston b/.smalltalkci/loading.development.ston
@@ -4,7 +4,8 @@ SmalltalkCISpec {
       #baseline : 'Bell',
       #directory : '../source',
       #load : [ 'Development' ],
-      #platforms : [  #pharo ]
+      #platforms : [  #pharo ],
+      #failOn : [ #Warning ]
     }
   ],
   #testing : {

diff --git a/.smalltalkci/loading.tests.ston b/.smalltalkci/loading.tests.ston
@@ -4,7 +4,8 @@ SmalltalkCISpec {
       #baseline : 'Bell',
       #directory : '../source',
       #load : [ 'Tests' ],
-      #platforms : [  #pharo ]
+      #platforms : [  #pharo ],
+      #failOn : [ #Warning ]
     }
   ],
   #testing : {

diff --git a/.smalltalkci/loading.tools.ston b/.smalltalkci/loading.tools.ston
@@ -4,7 +4,8 @@ SmalltalkCISpec {
       #baseline : 'Bell',
       #directory : '../source',
       #load : [ 'Tools' ],
-      #platforms : [  #pharo ]
+      #platforms : [  #pharo ],
+      #failOn : [ #Warning ]
     }
   ],
   #testing : {

diff --git a/.smalltalkci/unit-tests.ston b/.smalltalkci/unit-tests.ston
@@ -4,7 +4,8 @@ SmalltalkCISpec {
       #baseline : 'Bell',
       #directory : '../source',
       #load : [ 'CI' ],
-      #platforms : [  #pharo ]
+      #platforms : [  #pharo ],
+      #failOn : [ #Warning ]
     }
   ],
   #testing : {

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Buenos Aires Smalltalk Contributors
+Copyright (c) 2022-2024 Buenos Aires Smalltalk Contributors
 
 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/README.md b/README.md
@@ -5,15 +5,22 @@
 A library providing observability capabilities such as logs and metrics.
 
 [![Unit Tests](https://github.com/ba-st/Bell/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/ba-st/Bell/actions/workflows/unit-tests.yml/badge.svg)
+[![GS64 Unit Tests](https://github.com/ba-st/Bell/actions/workflows/unit-tests-gs64.yml/badge.svg)](https://github.com/ba-st/Bell/actions/workflows/unit-tests-gs64.yml/badge.svg)
 [![Coverage Status](https://codecov.io/github/ba-st/Bell/coverage.svg?branch=release-candidate)](https://codecov.io/gh/ba-st/Bell/branch/release-candidate)
+
 [![Baseline Groups](https://github.com/ba-st/Bell/actions/workflows/loading-groups.yml/badge.svg)](https://github.com/ba-st/Bell/actions/workflows/loading-groups.yml)
+[![GS64 Components](https://github.com/ba-st/Bell/actions/workflows/loading-gs64-components.yml/badge.svg)](https://github.com/ba-st/Bell/actions/workflows/loading-gs64-components.yml)
 [![Markdown Lint](https://github.com/ba-st/Bell/actions/workflows/markdown-lint.yml/badge.svg)](https://github.com/ba-st/Bell/actions/workflows/markdown-lint.yml)
 
 [![GitHub release](https://img.shields.io/github/release/ba-st/Bell.svg)](https://github.com/ba-st/Bell/releases/latest)
 [![Pharo 9.0](https://img.shields.io/badge/Pharo-9.0-informational)](https://pharo.org)
 [![Pharo 10](https://img.shields.io/badge/Pharo-10-informational)](https://pharo.org)
+[![Pharo 11](https://img.shields.io/badge/Pharo-11-informational)](https://pharo.org)
+
+[![GS64 3.7.0](https://img.shields.io/badge/GS64-3.7.0-informational)](https://gemtalksystems.com/products/gs64/)
+[![GS64 3.7.1](https://img.shields.io/badge/GS64-3.7.1-informational)](https://gemtalksystems.com/products/gs64/)
 
-> *Named in honour of [Jocelyn Bell Burnell](https://en.wikipedia.org/wiki/Jocelyn_Bell_Burnell),
+> *Named in honor of [Jocelyn Bell Burnell](https://en.wikipedia.org/wiki/Jocelyn_Bell_Burnell),
 > for her work and dedication to helping women and minorities in science, and
 > being part of the discovery of [radio pulsars](https://en.wikipedia.org/wiki/Pulsar).*
 
@@ -30,7 +37,7 @@ A library providing observability capabilities such as logs and metrics.
 
 ## Installation
 
-To load the project in a Pharo image follow this [instructions](docs/how-to/how-to-load-in-pharo.md).
+To load the project in a Pharo image follow these [instructions](docs/how-to/how-to-load-in-pharo.md).
 
 ## Contributing
 

diff --git a/docs/how-to/how-to-load-in-pharo.md b/docs/how-to/how-to-load-in-pharo.md
@@ -27,7 +27,7 @@
 6. Click *Ok*
 7. Select the repository in the main Iceberg window
 8. Open the contextual menu and select
-  *Metacello -> Install baseline of Bell ...*
+  *Metacello → Install baseline of Bell ...*
 9. Type `Development` and click *Ok*
 
 > After Iceberg cloned a repository, it will be checked-out at the default

diff --git a/rowan/components/Dependent-SUnit-Extensions.ston b/rowan/components/Dependent-SUnit-Extensions.ston
@@ -0,0 +1,20 @@
+RwSimpleProjectLoadComponentV2 {
+  #name : 'Dependent-SUnit-Extensions',
+  #condition : 'sunit',
+  #projectNames : [ ],
+  #componentNames : [
+    'Deployment'
+  ],
+  #packageNames : [
+    'Bell-SUnit'
+  ],
+  #conditionalPackageMapSpecs : {
+    'gemstone' : {
+      'allusers' : {
+        #packageNameToPlatformPropertiesMap : {
+          'Bell-SUnit' : { 'symbolDictName' : 'Bell' }
+        }
+      }
+    }
+  }
+}
diff --git a/rowan/components/Deployment.ston b/rowan/components/Deployment.ston
@@ -0,0 +1,21 @@
+RwSimpleProjectLoadComponentV2 {
+  #name : 'Deployment',
+  #projectNames : [ 'Zinc' ],
+  #componentNames : [ ],
+  #packageNames : [
+    'Beacon-GS64',
+    'Bell-GS64-Extensions',
+    'Bell-Logging'
+  ],
+  #conditionalPackageMapSpecs : {
+    'gemstone' : {
+      'allusers' : {
+        #packageNameToPlatformPropertiesMap : {
+            'Beacon-GS64' : { 'symbolDictName' : 'BeaconCore' },
+            'Bell-GS64-Extensions' : { 'symbolDictName' : 'Globals' },
+            'Bell-Logging' : { 'symbolDictName' : 'Bell' }
+        }
+        }
+     }
+  }
+}
diff --git a/rowan/components/Tests.ston b/rowan/components/Tests.ston
@@ -0,0 +1,23 @@
+RwSimpleProjectLoadComponentV2 {
+  #name : 'Tests',
+  #condition : 'tests',
+  #projectNames : [ ],
+  #componentNames : [
+    'Deployment',
+    'Dependent-SUnit-Extensions'
+  ],
+  #packageNames : [
+    'Beacon-GS64-Tests',
+    'Bell-Logging-Tests'
+  ],
+  #conditionalPackageMapSpecs : {
+    'gemstone' : {
+      'allusers' : {
+        #packageNameToPlatformPropertiesMap : {
+            'Beacon-GS64-Tests' : { 'symbolDictName' : 'BeaconCore' },
+            'Bell-Logging-Tests' : { 'symbolDictName' : 'Bell' }
+        }
+      }
+     }
+  }
+}
diff --git a/rowan/project.ston b/rowan/project.ston
@@ -0,0 +1,11 @@
+RwProjectSpecificationV2 {
+  #specName : 'project',
+  #projectSpecPath : 'rowan',
+  #componentsPath : 'rowan/components',
+  #packagesPath : 'source',
+  #projectsPath : 'rowan/projects',
+  #specsPath : 'rowan/specs',
+  #packageFormat : 'tonel',
+  #packageConvention : 'Rowan',
+  #comment : 'A library providing observability capabilities such as logs and metrics.'
+}
diff --git a/rowan/projects/Zinc.ston b/rowan/projects/Zinc.ston
@@ -0,0 +1,10 @@
+RwLoadSpecificationV2 {
+  #specName: 'Zinc',
+  #projectName : 'Zinc',
+  #gitUrl : 'https://github.com/ba-st-dependencies/Zinc.git',
+  #revision : 'v5',
+  #projectSpecFile : 'rowan/project.ston',
+  #componentNames : [
+    'Deployment'
+  ]
+}
diff --git a/rowan/specs/Bell-CI.ston b/rowan/specs/Bell-CI.ston
@@ -0,0 +1,14 @@
+RwLoadSpecificationV2 {
+  #specName: 'Bell-CI',
+  #projectName : 'Bell',
+  #diskUrl : 'Bell',
+  #projectSpecFile : 'rowan/project.ston',
+  #componentNames : [
+    'Tests'
+  ],
+  #customConditionalAttributes : [
+    'tests',
+    'sunit'
+  ],
+  #comment : 'Loading spec for the continuous integration setup'
+}
diff --git a/rowan/specs/Bell-Dependent-SUnit-Extensions.ston b/rowan/specs/Bell-Dependent-SUnit-Extensions.ston
@@ -0,0 +1,9 @@
+RwLoadSpecificationV2 {
+  #specName: 'Bell-Dependent-SUnit-Extensions',
+  #projectName : 'Bell',
+  #diskUrl : 'Bell',
+  #projectSpecFile : 'rowan/project.ston',
+  #componentNames : [
+    'Dependent-SUnit-Extensions'
+  ]
+}