Update dependencies and CI

ba-st · Feb 23, 2024 · 053ab83 · 053ab83
1 parent 2c82d11
commit 053ab83
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 31 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/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.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/source/BaselineOfSuperluminal/BaselineOfSuperluminal.class.st b/source/BaselineOfSuperluminal/BaselineOfSuperluminal.class.st
@@ -58,7 +58,7 @@ BaselineOfSuperluminal >> setUpDependencies: spec [
 		project: 'Teapot-Deployment' copyFrom: 'Teapot' with: [ spec loads: 'Deployment' ].
 
 	spec
-		baseline: 'Teachable' with: [ spec repository: 'github://astares/Pharo-Teachable:master' ];
+		baseline: 'Teachable' with: [ spec repository: 'github://ba-st-dependencies/Teachable:v3' ];
 		project: 'Teachable-Core' copyFrom: 'Teachable' with: [ spec loads: 'Core' ].
 
 	spec