Skip to content

Commit

Permalink
bump to 2.4.1 image
Browse files Browse the repository at this point in the history
  • Loading branch information
jbielick committed Mar 23, 2020
1 parent b222694 commit 23875bf
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 22 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2.4.1 | 2020-3-23
---

* Adds pronto-rails_data_schema runner (#11)

2.3.0 | 2019-12-31
---

Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ See the `Makefile` for more information.

# Base image

The ruby and pronto installation is done in the `Dockerfile.base` container image. Thus, pronto and runners are portable and can be run easily locally or otherwise. The code and formatter for the GitHub Action itself are added in a subsequent container image, built by `Dockerfile`. This container image is built during the GitHub action run. That way, the large, base image can be downloaded and only the small modifications in this Action can be layered on top. This results in a faster GitHub Action run.
The ruby and pronto installation is done in the `Dockerfile` container image. Thus, pronto and runners are portable and can be run easily locally or otherwise. The code and formatter for the GitHub Action itself are added to the container image.

To make modifications to the linux environment (tooling) or installed runners in this image, please do so in `Dockerfile.base`. After making modifications, a tag of `base-vX.X.X` should be created to trigger a dockerhub build.
After making modifications, a tag of `image-vX.X.X` should be created to trigger a dockerhub build.

Once the new base image is built and available in dockerhub, the `FROM` line in `Dockerfile` can be updated to point to it.
Once the new image is built and available in dockerhub, the image tag in `action.yml` should be updated to point to it.

Finally, create a release through GitHub's UI with a version bump and include CHANGELOG details in the release description.

Expand Down
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ test: spec/fixtures/test.git
spec/fixtures/test.git:
tar -zxf spec/fixtures/test.git.tar.gz

tag: image
docker tag ${name} ${name}:${TAG}
docker tag ${name} ${name}:latest
# tag: image
# docker tag ${name} ${name}:${TAG}

push: tag
push: image
docker push ${name}:${TAG}

console: spec/fixtures/test.git
Expand Down
16 changes: 2 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: adwerx/pronto-ruby@v2.2.0
- uses: adwerx/pronto-ruby@v2.4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -74,19 +74,7 @@ With specific runners:

```yaml
name: Pronto
on:
- push
- pull_request
jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: adwerx/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# ...
with:
runners: >-
rubocop rails_schema yamllint
Expand Down
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ inputs:
origin/master
runs:
using: docker
image: "docker://docker.io/adwerx/pronto-ruby:2.3.1"
image: "docker://docker.io/adwerx/pronto-ruby:2.4.1"
args:
- run
- -r
Expand Down

0 comments on commit 23875bf

Please sign in to comment.