Skip to content

Commit f8dfc04

Browse files
gcotelligcotelli
committed
Add GS64 rowan metadata
1 parent a215c79 commit f8dfc04

20 files changed

+188
-44
lines changed

‎.github/workflows/docker-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: Build and Publish Docker Images
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 2
2020
- name: Docker meta

‎.github/workflows/integration-tests.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
name: Integration Tests
2-
3-
on: [push,pull_request,workflow_dispatch]
4-
2+
on:
3+
- push
4+
- pull_request
5+
- workflow_dispatch
56
jobs:
67
integration-tests:
78
runs-on: ubuntu-latest
89
name: Integration Tests
910
steps:
10-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1112
with:
1213
fetch-depth: 2
1314
- name: Run tests using Docker

‎.github/workflows/loading-groups.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
name: Baseline Groups
2-
3-
on: [push,pull_request,workflow_dispatch]
4-
2+
on:
3+
- push
4+
- pull_request
5+
- workflow_dispatch
56
jobs:
67
group-loading:
78
runs-on: ubuntu-latest
89
strategy:
910
fail-fast: false
1011
matrix:
11-
smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0 ]
12-
load-spec: [ deployment, examples, tools, development]
12+
smalltalk:
13+
- Pharo64-10
14+
- Pharo64-11
15+
load-spec:
16+
- deployment
17+
- examples
18+
- tools
19+
- development
1320
name: ${{ matrix.smalltalk }} + ${{ matrix.load-spec }}
1421
steps:
15-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
1623
- uses: hpi-swa/setup-smalltalkCI@v1
1724
with:
1825
smalltalk-image: ${{ matrix.smalltalk }}

‎.github/workflows/loading-gs64-components.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: 'GS64 Components Loading'
2+
on:
3+
- push
4+
- pull_request
5+
- workflow_dispatch
6+
jobs:
7+
component-loading:
8+
runs-on: ubuntu-latest
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
load-spec:
13+
- Deployment
14+
name: GS64 + ${{ matrix.load-spec }}
15+
steps:
16+
- uses: actions/checkout@v3
17+
- name: Load component in image
18+
uses: ba-st-actions/gs64-ci@v2
19+
with:
20+
project_name: 'Stargate-Consul'
21+
load_spec: 'Stargate-Consul-${{ matrix.load-spec }}'

‎.github/workflows/markdown-lint.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
name: Markdown Lint
2-
on: [push,pull_request,workflow_dispatch]
2+
on:
3+
- push
4+
- pull_request
5+
- workflow_dispatch
36
jobs:
47
remark-lint:
58
name: runner / markdownlint
69
runs-on: ubuntu-latest
710
steps:
8-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
912
- name: markdownlint
1013
uses: reviewdog/action-markdownlint@v0
1114
with:

‎.github/workflows/notify.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
name: Release Notifications
2-
3-
on:
4-
release:
5-
types: [published]
6-
2+
on: workflow_dispatch
73
jobs:
84
notify:
95
runs-on: ubuntu-latest

‎.github/workflows/shellcheck.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
name: Shellcheck
2-
3-
on: [push,pull_request]
4-
2+
on:
3+
- push
4+
- pull_request
5+
- workflow_dispatch
56
jobs:
67
shellcheck:
78
runs-on: ubuntu-latest
89
steps:
9-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
1011
- name: Run Shellcheck
1112
uses: reviewdog/action-shellcheck@v1
1213
with:

‎.github/workflows/unit-tests-gs64.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: 'GS64 Unit Tests'
2+
on:
3+
- push
4+
- pull_request
5+
- workflow_dispatch
6+
jobs:
7+
unit-tests:
8+
runs-on: ubuntu-latest
9+
name: GS64 Unit Tests
10+
steps:
11+
- uses: actions/checkout@v4
12+
- name: Load Image and Run Tests
13+
uses: ba-st-actions/gs64-ci@v2
14+
with:
15+
project_name: 'Stargate-Consul'
16+
run_tests: 'true'

‎.github/workflows/unit-tests.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
name: Unit Tests
2-
3-
on: [push,pull_request,workflow_dispatch]
4-
2+
on:
3+
- push
4+
- pull_request
5+
- workflow_dispatch
56
jobs:
67
build:
78
runs-on: ubuntu-latest
89
strategy:
910
matrix:
10-
smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0 ]
11+
smalltalk:
12+
- Pharo64-10
13+
- Pharo64-11
1114
name: ${{ matrix.smalltalk }}
1215
steps:
1316
- name: Checkout
14-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1518
- uses: hpi-swa/setup-smalltalkCI@v1
1619
with:
1720
smalltalk-image: ${{ matrix.smalltalk }}

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020-2022 Buenos Aires Smalltalk Contributors
3+
Copyright (c) 2020-2024 Buenos Aires Smalltalk Contributors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,23 @@
55
This library provides a [Stargate](https://github.com/ba-st/Stargate) operational
66
plugin to interact with the [Consul](https://www.consul.io) HTTP API.
77

8-
[![Unit Tests](https://github.com/ba-st/Stargate-Consul/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/ba-st/Stargate-Consul/actions/workflows/unit-tests.yml)
8+
[![Pharo Unit Tests](https://github.com/ba-st/Stargate-Consul/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/ba-st/Stargate-Consul/actions/workflows/unit-tests.yml)
9+
[![GS64 - Unit Tests](https://github.com/ba-st/Stargate-Consul/actions/workflows/unit-tests-gs64.yml/badge.svg)](https://github.com/ba-st/Stargate-Consul/actions/workflows/unit-tests-gs64.yml)
910
[![Coverage Status](https://codecov.io/github/ba-st/Stargate-Consul/coverage.svg?branch=release-candidate)](https://codecov.io/gh/ba-st/Stargate-Consul/branch/release-candidate)
11+
1012
[![Baseline Groups](https://github.com/ba-st/Stargate-Consul/actions/workflows/loading-groups.yml/badge.svg)](https://github.com/ba-st/Stargate-Consul/actions/workflows/loading-groups.yml)
13+
[![GS64 Components](https://github.com/ba-st/Stargate-Consul/actions/workflows/loading-gs64-components.yml/badge.svg)](https://github.com/ba-st/Stargate-Consul/actions/workflows/loading-gs64-components.yml)
1114
[![Integration Tests](https://github.com/ba-st/Stargate-Consul/actions/workflows/integration-tests.yml/badge.svg)](https://github.com/ba-st/Stargate-Consul/actions/workflows/integration-tests.yml)
1215
[![Markdown Lint](https://github.com/ba-st/Stargate-Consul/actions/workflows/markdown-lint.yml/badge.svg)](https://github.com/ba-st/Stargate-Consul/actions/workflows/markdown-lint.yml)
1316
[![Shellcheck](https://github.com/ba-st/Stargate-Consul/actions/workflows/shellcheck.yml/badge.svg)](https://github.com/ba-st/Stargate-Consul/actions/workflows/shellcheck.yml)
1417

1518
[![GitHub release](https://img.shields.io/github/release/ba-st/Stargate-Consul.svg)](https://github.com/ba-st/Stargate-Consul/releases/latest)
16-
[![Pharo 8.0](https://img.shields.io/badge/Pharo-8.0-informational)](https://pharo.org)
17-
[![Pharo 9.0](https://img.shields.io/badge/Pharo-9.0-informational)](https://pharo.org)
19+
1820
[![Pharo 10](https://img.shields.io/badge/Pharo-10-informational)](https://pharo.org)
1921
[![Pharo 11](https://img.shields.io/badge/Pharo-11-informational)](https://pharo.org)
2022

23+
[![GS64 3.7.0](https://img.shields.io/badge/GS64-3.7.0-informational)](https://gemtalksystems.com/products/gs64/)
24+
2125
Quick links
2226

2327
- [**Explore the docs**](docs/README.md)

‎docker/Dockerfile

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,14 @@ RUN pharo metacello install gitlocal://. \
77
BaselineOfStargateConsul --groups=Examples
88

99
# Stage 2: Copy the resulting Pharo.image
10-
FROM ghcr.io/ba-st/launchpad:v4
10+
FROM ghcr.io/ba-st/launchpad:v5
1111

12-
USER root
12+
COPY --from=loader --chown=pharo:users --chmod=755 /opt/pharo/pharo-local/iceberg/ba-st/Stargate/docker/health-check.sh ./
13+
COPY --from=loader --chown=pharo:users /opt/pharo/Pharo.image ./
14+
COPY --from=loader --chown=pharo:users /opt/pharo/Pharo.changes ./
15+
COPY --from=loader --chown=pharo:users /opt/pharo/Pharo*.sources ./
1316

14-
COPY --from=loader /opt/pharo/pharo-local/iceberg/ba-st/Stargate/docker/health-check.sh ./
15-
COPY --from=loader /opt/pharo/Pharo.image ./
16-
COPY --from=loader /opt/pharo/Pharo.changes ./
17-
COPY --from=loader /opt/pharo/Pharo*.sources ./
18-
19-
RUN mkdir logs \
20-
&& chmod a+x health-check.sh \
21-
&& chown --recursive pharo:users /opt/pharo
22-
23-
USER pharo
17+
RUN mkdir logs
2418

2519
HEALTHCHECK CMD ./health-check.sh
2620

‎rowan/components/Deployment.ston

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
RwSimpleProjectLoadComponentV2 {
2+
#name : 'Deployment',
3+
#projectNames : [
4+
'Stargate',
5+
'Superluminal'
6+
],
7+
#componentNames : [ ],
8+
#packageNames : [
9+
'Stargate-Consul'
10+
],
11+
#conditionalPackageMapSpecs : {
12+
'gemstone' : {
13+
'allusers' : {
14+
#packageNameToPlatformPropertiesMap : {
15+
'Stargate-Consul' : { 'symbolDictName' : 'Stargate' }
16+
}
17+
}
18+
}
19+
}
20+
}

‎rowan/components/Tests.ston

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
RwSimpleProjectLoadComponentV2 {
2+
#name : 'Tests',
3+
#condition : 'tests',
4+
#projectNames : [ ],
5+
#componentNames : [
6+
'Deployment'
7+
],
8+
#packageNames : [
9+
'Stargate-Consul-Tests'
10+
11+
],
12+
#conditionalPackageMapSpecs : {
13+
'gemstone' : {
14+
'allusers' : {
15+
#packageNameToPlatformPropertiesMap : {
16+
'Stargate-Consul-Tests' : { 'symbolDictName' : 'Stargate' }
17+
}
18+
}
19+
}
20+
}
21+
}

‎rowan/project.ston

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
RwProjectSpecificationV2 {
2+
#specName : 'project',
3+
#projectSpecPath : 'rowan',
4+
#componentsPath : 'rowan/components',
5+
#packagesPath : 'source',
6+
#projectsPath : 'rowan/projects',
7+
#specsPath : 'rowan/specs',
8+
#packageFormat : 'tonel',
9+
#packageConvention : 'Rowan',
10+
#comment : 'Stargate Consul project specification'
11+
}

‎rowan/projects/Stargate.ston

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
RwLoadSpecificationV2 {
2+
#specName: 'Stargate',
3+
#projectName : 'Stargate',
4+
#gitUrl : 'https://github.com/ba-st/Stargate.git',
5+
#revision : 'v9',
6+
#projectSpecFile : 'rowan/project.ston',
7+
#componentNames : [
8+
'Deployment',
9+
'Dependent-SUnit-Extensions'
10+
]
11+
}

‎rowan/projects/Superluminal.ston

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
RwLoadSpecificationV2 {
2+
#specName: 'Superluminal',
3+
#projectName : 'Superluminal',
4+
#gitUrl : 'https://github.com/ba-st/Superluminal.git',
5+
#revision : 'v5',
6+
#projectSpecFile : 'rowan/project.ston',
7+
#componentNames : [
8+
'API-Client',
9+
'Dependent-SUnit-Extensions'
10+
]
11+
}

‎rowan/specs/Stargate-Consul-CI.ston

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
RwLoadSpecificationV2 {
2+
#specName: 'Stargate-Consul-CI',
3+
#projectName : 'Stargate-Consul',
4+
#diskUrl : 'Stargate-Consul',
5+
#projectSpecFile : 'rowan/project.ston',
6+
#componentNames : [
7+
'Tests'
8+
],
9+
#customConditionalAttributes : [
10+
'tests',
11+
'sunit'
12+
],
13+
#comment : 'Loading spec for the continuous integration setup'
14+
}

‎rowan/specs/Stargate-Consul-Deployment.ston

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
RwLoadSpecificationV2 {
2+
#specName: 'Stargate-Consul-Deployment',
3+
#projectName : 'Stargate-Consul',
4+
#diskUrl : 'Stargate-Consul',
5+
#projectSpecFile : 'rowan/project.ston',
6+
#componentNames : [
7+
'Deployment'
8+
]
9+
}

‎source/.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
#format : #tonel
2+
#format : #tonel,
3+
#convention : 'Rowan'
34
}

0 commit comments

Comments
 (0)