From 23875bfce717a0ea686af94de62f773d02375918 Mon Sep 17 00:00:00 2001 From: Josh Bielick Date: Mon, 23 Mar 2020 12:23:51 -0400 Subject: [PATCH] bump to 2.4.1 image --- CHANGELOG.md | 5 +++++ CONTRIBUTING.md | 6 +++--- Makefile | 7 +++---- README.md | 16 ++-------------- action.yml | 2 +- 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffe48f6..86300c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +2.4.1 | 2020-3-23 +--- + + * Adds pronto-rails_data_schema runner (#11) + 2.3.0 | 2019-12-31 --- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c101643..69383d3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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. diff --git a/Makefile b/Makefile index f50541c..69de80d 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/README.md b/README.md index 67197d2..f7bc0be 100644 --- a/README.md +++ b/README.md @@ -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 }} @@ -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/pronto-ruby@2.2.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# ... with: runners: >- rubocop rails_schema yamllint diff --git a/action.yml b/action.yml index 8e8e764..930796d 100644 --- a/action.yml +++ b/action.yml @@ -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