Skip to content

Commit

Permalink
Merge pull request #59 from ba-st/pharo11
Browse files Browse the repository at this point in the history
Add Pharo 11 support
  • Loading branch information
gcotelli committed May 29, 2023
2 parents c1cc9bb + d6383ef commit 0233d99
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 21 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/docker-build.yml
Expand Up @@ -20,20 +20,20 @@ jobs:
fetch-depth: 2
- name: Docker meta
id: docker_meta
uses: crazy-max/ghaction-docker-meta@v1
uses: crazy-max/ghaction-docker-meta@v4
with:
images: ghcr.io/${{ github.repository_owner }}/willow-playground
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
- name: Login to Container Registry
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
- name: Docker build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
context: ./
file: ./docker/Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/loading-groups.yml
Expand Up @@ -8,11 +8,11 @@ jobs:
strategy:
fail-fast: false
matrix:
smalltalk: [ Pharo64-10 ]
smalltalk: [ Pharo64-11 ]
load-spec: [ deployment, development ]
name: ${{ matrix.smalltalk }} + ${{ matrix.load-spec }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: hpi-swa/setup-smalltalkCI@v1
with:
smalltalk-image: ${{ matrix.smalltalk }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/markdown-lint.yml
Expand Up @@ -5,9 +5,9 @@ jobs:
name: runner / markdownlint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: markdownlint
uses: reviewdog/action-markdownlint@v0.1
uses: reviewdog/action-markdownlint@v0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
fail_on_error: true
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -9,7 +9,7 @@ to develop a complete interactive web application.
[![Markdown Lint](https://github.com/ba-st/Willow-Playground/actions/workflows/markdown-lint.yml/badge.svg)](https://github.com/ba-st/Willow-Playground/actions/workflows/markdown-lint.yml)

[![GitHub release](https://img.shields.io/github/release/ba-st/Willow-Playground.svg)](https://github.com/ba-st/Willow-Playground/releases/latest)
[![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)

## Goals

Expand Down
7 changes: 3 additions & 4 deletions docker/Dockerfile
@@ -1,15 +1,14 @@
# Stage 1: Load the project
FROM ghcr.io/ba-st/pharo-loader:v10.0.0 as loader
FROM ghcr.io/ba-st/pharo-loader:v11.0.0 as loader

COPY ./source ./source
COPY ./.git/ ./.git/
COPY --chown=pharo:users ./source ./source
COPY --chown=pharo:users ./.git/ ./.git/
RUN pharo metacello install gitlocal://./source \
BaselineOfWillowPlayground --groups=Deployment

# Stage 2: Copy the Pharo image into the base
FROM ghcr.io/ba-st/launchpad:v4

COPY --from=loader /opt/pharo/Pharo.image ./
COPY --from=loader /opt/pharo/Pharo.changes ./
COPY --from=loader /opt/pharo/Pharo*.sources ./
CMD [ "launchpad-start", "playground" ]
5 changes: 0 additions & 5 deletions docs/reference/Baseline-groups.md
Expand Up @@ -4,10 +4,5 @@ Willow Playground includes the following groups in its Baseline that can be used
as loading targets:

- `Deployment` will load all the packages needed in a deployed application
- `Tests` will load the test cases
- `Tools` will load tooling extensions
- `Dependent-SUnit-Extensions` will load extensions to SUnit
- `CI` is the group loaded in the continuous integration setup, in this
particular case it is the same as `Tests`
- `Development` will load all the needed packages to develop and contribute to
the project
Expand Up @@ -25,20 +25,20 @@ BaselineOfWillowPlayground >> setUpDependencies: spec [

spec
baseline: 'Willow'
with: [ spec repository: 'github://ba-st/Willow:v14' ];
with: [ spec repository: 'github://ba-st/Willow:v15' ];
project: 'Willow-Development'
copyFrom: 'Willow'
with: [ spec loads: 'Development' ].
spec
baseline: 'WillowBootstrap'
with: [ spec repository: 'github://ba-st/Willow-Bootstrap:v13' ];
with: [ spec repository: 'github://ba-st/Willow-Bootstrap:v14' ];
project: 'Willow-Bootstrap-Deployment'
copyFrom: 'WillowBootstrap'
with: [ spec loads: 'Deployment' ].

spec
baseline: 'WillowSpinKit'
with: [ spec repository: 'github://ba-st/Willow-SpinKit:v9' ];
with: [ spec repository: 'github://ba-st/Willow-SpinKit:v10' ];
project: 'Willow-SpinKit-Deployment'
copyFrom: 'WillowSpinKit'
with: [ spec loads: 'Deployment' ].
Expand Down

0 comments on commit 0233d99

Please sign in to comment.