Skip to content

Commit

Permalink
Upgrade to Groovy 4.0.23, move to Github Actions and GHCR
Browse files Browse the repository at this point in the history
  • Loading branch information
FayeSGW committed Nov 7, 2024
1 parent 3f31945 commit 6e1460e
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 39 deletions.
33 changes: 0 additions & 33 deletions .circleci/config.yml

This file was deleted.

File renamed without changes.
28 changes: 28 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Main

on:
push:
branches:
- master
# schedule:
# - cron: '0 9 * * MON'

# These environment variables are used in the image builder script used to
# build Docker images
env:
PACKAGES_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Token for GHCR
PACKAGES_USERNAME: ${{ github.actor }} # Username for GHCR
REPO_NAME: ${{ github.event.repository.name }} # Repository name (so image_builder can check if it's testing itself)
TYPE: ${{ github.event_name }} # Event type (push or schedule) (so image_builder doesn't push images to GHCR on schedule)

jobs:

build-publish-trigger:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Build image, test it, push it dockerhub, notify dependents
run: ./pipe_build_up_test.sh
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![CircleCI](https://circleci.com/gh/cyber-dojo-languages/groovy-spock.svg?style=svg)](https://circleci.com/gh/cyber-dojo-languages/groovy-spock)
[![Github Action (main)](https://github.com/cyber-dojo-languages/groovy-spock/actions/workflows/main.yml/badge.svg)](https://github.com/cyber-dojo-languages/groovy-spock/actions)

## display_name="Groovy, Spock"
## image_name="cyberdojofoundation/groovy_spock"
## display_name="Groovy 4.0.23, Spock 2.4"
## image_name="ghcr.io/cyber-dojo-languages/groovy_spock"

![cyber-dojo.org home page](https://github.com/cyber-dojo/cyber-dojo/blob/master/shared/home_page_snapshot.png)
4 changes: 2 additions & 2 deletions docker/Dockerfile.base
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM cyberdojofoundation/groovy:b88c952
FROM ghcr.io/cyber-dojo-languages/groovy:a7445f4
LABEL [email protected]

ARG VERSION=4.0.9
ARG VERSION=4.0.23

RUN mkdir /groovy

Expand Down
2 changes: 1 addition & 1 deletion docker/image_name.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"image_name": "cyberdojofoundation/groovy_spock"
"image_name": "ghcr.io/cyber-dojo-languages/groovy_spock"
}

0 comments on commit 6e1460e

Please sign in to comment.