Skip to content

Commit

Permalink
Merge pull request #1059 from gliderlabs/master
Browse files Browse the repository at this point in the history
Release 0.7.2
  • Loading branch information
josegonzalez authored Oct 13, 2023
2 parents 3583c85 + 786c0ec commit 34b199e
Show file tree
Hide file tree
Showing 18 changed files with 87 additions and 59 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- 22

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -58,11 +58,11 @@ jobs:
run: make deps fpm package_cloud

- name: set up qemu
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: set up docker buildx
id: buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: inspect builder
run: |
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
- 22

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-go@v4
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
- 22

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Login to DockerHub
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand All @@ -35,11 +35,11 @@ jobs:
run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT

- name: set up qemu
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: set up docker buildx
id: buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: inspect builder
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/tag-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- 22

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -33,10 +33,10 @@ jobs:
ruby-version: 2.6

- name: set up qemu
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: set up docker buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- uses: actions/setup-python@v4
with:
Expand All @@ -61,7 +61,7 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: ruby/setup-ruby@v1
with:
Expand All @@ -75,7 +75,7 @@ jobs:

- name: Login to DockerHub
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: bump-buildpacks
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
37 changes: 37 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,43 @@
# Change Log
All notable changes to this project will be documented in this file.

## [0.7.2](https://github.com/gliderlabs/herokuish/compare/v0.7.1...v0.7.2) - 2023-10-11

- #1024 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi
- #1025 @dependabot: chore(deps): bump twig/twig from 3.7.0 to 3.7.1 in /buildpacks/buildpack-php/tests/php
- #1026 @dokku-bot: Update php to version v238
- #1027 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi
- #1028 @dependabot: chore(deps): bump actions/checkout from 3 to 4
- #1029 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi
- #1030 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi
- #1031 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi
- #1032 @dependabot: chore(deps): bump docker/login-action from 2 to 3
- #1033 @dependabot: chore(deps): bump docker/setup-qemu-action from 2 to 3
- #1034 @dependabot: chore(deps): bump docker/setup-buildx-action from 2 to 3
- #1035 @dokku-bot: Update nodejs to version v220
- #1036 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi
- #1037 @dokku-bot: Update clojure to version v91
- #1038 @dokku-bot: Update go to version v180
- #1039 @dokku-bot: Update nodejs to version v221
- #1040 @dependabot: chore(deps): bump puma from 6.3.1 to 6.4.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra
- #1041 @dokku-bot: Update ruby to version v257
- #1042 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi
- #1043 @dokku-bot: Update nodejs to version v222
- #1044 @dokku-bot: Update ruby to version v258
- #1045 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi
- #1046 @dokku-bot: Update php to version v239
- #1047 @dependabot: chore(deps): bump flask from 2.3.3 to 3.0.0 in /buildpacks/buildpack-python/tests/python-flask
- #1048 @dependabot: chore(deps): bump flask from 2.3.3 to 3.0.0 in /buildpacks/buildpack-multi/tests/multi
- #1049 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi
- #1050 @dokku-bot: Update ruby to version v259
- #1051 @dokku-bot: Update python to version v236
- #1053 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi
- #1054 @dokku-bot: Update python to version v237
- #1055 @dokku-bot: Update nodejs to version v223
- #1056 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi
- #1057 @dokku-bot: Update nodejs to version v224
- #1058 @dokku-bot: Update go to version v181

## [0.7.1](https://github.com/gliderlabs/herokuish/compare/v0.7.0...v0.7.1) - 2023-08-27

- #1001 @josegonzalez: Use updated method for setting output data in github actions
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ REPOSITORY = herokuish
DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
HARDWARE = $(shell uname -m)
SYSTEM_NAME = $(shell uname -s | tr '[:upper:]' '[:lower:]')
VERSION ?= 0.7.1
VERSION ?= 0.7.2
IMAGE_NAME ?= $(NAME)
BUILD_TAG ?= dev
PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Build Status](https://github.com/gliderlabs/herokuish/workflows/CI/badge.svg)](https://github.com/gliderlabs/herokuish/actions?query=workflow%3ACI)
[![IRC Channel](https://img.shields.io/badge/irc-%23gliderlabs-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/#gliderlabs)
[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.7.1-blue)](https://hub.docker.com/r/gliderlabs/herokuish)
[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.7.2-blue)](https://hub.docker.com/r/gliderlabs/herokuish)

A command line tool for emulating Heroku build and runtime tasks in containers.

Expand All @@ -19,7 +19,7 @@ Download and uncompress the latest binary tarball from [releases](https://github
For example, you can do this directly in your Dockerfiles installing into `/bin` as one step:

```shell
RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.7.1/herokuish_0.7.1_linux_x86_64.tgz \
RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.7.2/herokuish_0.7.2_linux_x86_64.tgz \
| tar -xzC /bin
```

Expand Down
2 changes: 1 addition & 1 deletion buildpacks/buildpack-clojure/buildpack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v90
v91
2 changes: 1 addition & 1 deletion buildpacks/buildpack-go/buildpack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v178
v181
15 changes: 3 additions & 12 deletions buildpacks/buildpack-multi/tests/multi/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
GEM
remote: http://rubygems.org/
specs:
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
rack (2.2.8)
rack-protection (3.1.0)
rack (~> 2.2, >= 2.2.4)
ruby2_keywords (0.0.5)
sinatra (3.1.0)
mustermann (~> 3.0)
rack (~> 2.2, >= 2.2.4)
rack-protection (= 3.1.0)
tilt (~> 2.0)
tilt (2.2.0)
rack (3.0.8)
sinatra (1.0)
rack (>= 1.0)

PLATFORMS
ruby
Expand Down
2 changes: 1 addition & 1 deletion buildpacks/buildpack-multi/tests/multi/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Flask==2.3.3
Flask==3.0.0
Jinja2==3.1.2
gunicorn==21.2.0
markupsafe==2.1.3
2 changes: 1 addition & 1 deletion buildpacks/buildpack-nodejs/buildpack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v219
v224
2 changes: 1 addition & 1 deletion buildpacks/buildpack-php/buildpack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v237
v239
42 changes: 21 additions & 21 deletions buildpacks/buildpack-php/tests/php/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion buildpacks/buildpack-python/buildpack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v235
v237
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Flask==2.3.3
Flask==3.0.0
Jinja2==3.1.2
gunicorn==21.2.0
markupsafe==2.1.3
2 changes: 1 addition & 1 deletion buildpacks/buildpack-ruby/buildpack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v256
v259
2 changes: 1 addition & 1 deletion buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ GEM
ruby2_keywords (~> 0.0.1)
nio4r (2.5.9)
power_assert (2.0.3)
puma (6.3.1)
puma (6.4.0)
nio4r (~> 2.0)
rack (2.2.8)
rack-protection (3.1.0)
Expand Down

0 comments on commit 34b199e

Please sign in to comment.