Merge pull request #992 from gliderlabs/master

Release 0.6.1
gliderlabs · Aug 6, 2023 · 0ff2a0e · 0ff2a0e
2 parents 6f7353f + 58607ed
commit 0ff2a0e
Show file tree

Hide file tree

Showing 14 changed files with 114 additions and 26 deletions.
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -0,0 +1,28 @@
+---
+name: Bump buildpacks
+
+# yamllint disable-line rule:truthy
+on:
+ schedule:
+ - cron: '37 13 * * *'
+ workflow_dispatch: {}
+
+jobs:
+ build:
+ name: bump-buildpacks
+ runs-on: ubuntu-20.04
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+
+ - name: configure git
+ run: |
+ git config --global user.name 'Dokku Bot'
+ git config --global user.email no-reply@dokku.com
+
+ - name: bump buildpacks
+ run: |
+ make bumpup
+ env:
+ GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,57 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [0.6.1](https://github.com/gliderlabs/herokuish/compare/v0.6.0...v0.6.1) - 2023-08-06
+
+- #933 @dependabot: chore(deps): bump puma from 6.2.2 to 6.3.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra
+- #934 @dependabot: chore(deps): bump markupsafe from 2.1.2 to 2.1.3 in /buildpacks/buildpack-multi/tests/multi
+- #935 @dependabot: chore(deps): bump markupsafe from 2.1.2 to 2.1.3 in /buildpacks/buildpack-python/tests/python-flask
+- #936 @josegonzalez: Update python to version v233
+- #937 @josegonzalez: feat: automate updates of buildpacks in ci
+- #938 @josegonzalez: fix: ensure the codebase is available for the make target to run
+- #939 @dependabot: chore(deps): bump twig/twig from 3.6.0 to 3.6.1 in /buildpacks/buildpack-php/tests/php
+- #940 @josegonzalez: Fix issues with auto-bumping buildpacks
+- #941 @dokku-bot: Update php to version v235
+- #942 @dependabot: chore(deps-dev): bump test-unit from 3.5.9 to 3.6.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra
+- #943 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi
+- #944 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi
+- #945 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi
+- #946 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi
+- #947 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi
+- #948 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi
+- #949 @dokku-bot: Update nodejs to version v215
+- #950 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi
+- #951 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi
+- #952 @dependabot: chore(deps-dev): bump test-unit from 3.6.0 to 3.6.1 in /buildpacks/buildpack-ruby/tests/ruby-sinatra
+- #953 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi
+- #954 @dokku-bot: Update go to version v175
+- #955 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi
+- #956 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi
+- #957 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi
+- #958 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi
+- #959 @dokku-bot: Update nodejs to version v216
+- #960 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi
+- #961 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi
+- #962 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi
+- #963 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi
+- #971 @dependabot: chore(deps): bump gunicorn from 20.1.0 to 21.2.0 in /buildpacks/buildpack-multi/tests/multi
+- #972 @dependabot: chore(deps): bump gunicorn from 20.1.0 to 21.2.0 in /buildpacks/buildpack-python/tests/python-flask
+- #973 @dependabot: chore(deps): bump gunicorn from 20.1.0 to 21.2.0 in /buildpacks/buildpack-python/tests/python-django
+- #974 @dokku-bot: Update nodejs to version v217
+- #975 @dokku-bot: Update php to version v236
+- #976 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi
+- #977 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi
+- #978 @dokku-bot: Update python to version v234
+- #979 @dokku-bot: Update ruby to version v255
+- #980 @dokku-bot: Update nodejs to version v218
+- #981 @dependabot: chore(deps): bump twig/twig from 3.6.1 to 3.7.0 in /buildpacks/buildpack-php/tests/php
+- #982 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi
+- #983 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi
+- #984 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi
+- #985 @dependabot: chore(deps): bump rack from 2.2.7 to 2.2.8 in /buildpacks/buildpack-ruby/tests/ruby-sinatra
+- #986 @Coffee2CodeNL: Add Bookworm Support
+- #987 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi
+
 ## [0.6.0](https://github.com/gliderlabs/herokuish/compare/v0.5.42...v0.6.0) - 2023-05-26
 
 - @josegonzalez Drop Ubuntu 18 support #923

diff --git a/Makefile b/Makefile
@@ -195,23 +195,32 @@ release-packagecloud-deb: package_cloud build/deb/$(NAME)_$(VERSION)_all.deb
  package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/stretch build/deb/$(NAME)_$(VERSION)_all.deb
  package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/buster build/deb/$(NAME)_$(VERSION)_all.deb
  package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_all.deb
+ package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bookworm build/deb/$(NAME)_$(VERSION)_all.deb
 
 release-packagecloud-rpm: package_cloud build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm
  package_cloud push $(PACKAGECLOUD_REPOSITORY)/el/7 build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm
 
 bumpup:
  for i in $(BUILDPACK_ORDER); do \
  url=$$(cat buildpacks/buildpack-$$i/buildpack-url) ; \
+ current_version=$$(cat buildpacks/buildpack-$$i/buildpack-version) ; \
  version=$$(git ls-remote --tags $$url | awk '{print $$2}' | sed 's/refs\/tags\///' | egrep 'v[0-9]+$$' | sed 's/v//' | sort -n | tail -n 1) ; \
+ branch_name=$$(echo "update-$$i-from-$$current_version-to-$$version") ; \
  if [[ "x$$version" != 'x' ]]; then \
+ if [[ $$(git rev-parse --verify $$branch_name 2>/dev/null) ]] ; then \
+ continue ; \
+ fi ; \
  echo v$$version > buildpacks/buildpack-$$i/buildpack-version ; \
  git status -s buildpacks/buildpack-$$i/buildpack-version | fgrep ' M ' ; \
- if [[ $$? -eq 0 ]] ; then \
- git checkout -b $$(date +%Y%m%d)-update-$$i ; \
- git add buildpacks/buildpack-$$i/buildpack-version ; \
- git commit -m "Update $$i to version v$$version" ; \
- git checkout - ; \
+ if [[ $$? -eq 1 ]] ; then \
+ continue ; \
  fi ; \
+ git checkout -b $$branch_name ; \
+ git add buildpacks/buildpack-$$i/buildpack-version ; \
+ git commit -m "Update $$i to version v$$version" ; \
+ git checkout - ; \
+ git push origin $$branch_name ; \
+ gh pr create --title "Update $$i to version v$$version" --body "From $$current_version" --head $$branch_name ; \
  fi ; \
  done
 

diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version
@@ -1 +1 @@
-v174
+v176
diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
  specs:
  mustermann (3.0.0)
  ruby2_keywords (~> 0.0.1)
- rack (2.2.7)
+ rack (2.2.8)
  rack-protection (3.0.6)
  rack
  ruby2_keywords (0.0.5)
@@ -12,7 +12,7 @@ GEM
  rack (~> 2.2, >= 2.2.4)
  rack-protection (= 3.0.6)
  tilt (~> 2.0)
- tilt (2.1.0)
+ tilt (2.2.0)
 
 PLATFORMS
  ruby

diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt
@@ -1,4 +1,4 @@
 Flask==2.3.2
 Jinja2==3.1.2
-gunicorn==20.1.0
-markupsafe==2.1.2
+gunicorn==21.2.0
+markupsafe==2.1.3
diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version
@@ -1 +1 @@
-v213
+v218
diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version
@@ -1 +1 @@
-v234
+v237
diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock
diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version
@@ -1 +1 @@
-v232
+v234
diff --git a/buildpacks/buildpack-python/tests/python-django/requirements.txt b/buildpacks/buildpack-python/tests/python-django/requirements.txt
@@ -1,2 +1,2 @@
 Django==2.2.28
-gunicorn==20.1.0
+gunicorn==21.2.0
diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt
@@ -1,4 +1,4 @@
 Flask==2.3.2
 Jinja2==3.1.2
-gunicorn==20.1.0
-markupsafe==2.1.2
+gunicorn==21.2.0
+markupsafe==2.1.3
diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version
@@ -1 +1 @@
-v254
+v256
diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock
@@ -5,9 +5,9 @@ GEM
  ruby2_keywords (~> 0.0.1)
  nio4r (2.5.9)
  power_assert (2.0.3)
- puma (6.2.2)
+ puma (6.3.0)
  nio4r (~> 2.0)
- rack (2.2.7)
+ rack (2.2.8)
  rack-protection (3.0.6)
  rack
  rack-test (2.1.0)
@@ -19,7 +19,7 @@ GEM
  rack (~> 2.2, >= 2.2.4)
  rack-protection (= 3.0.6)
  tilt (~> 2.0)
- test-unit (3.5.9)
+ test-unit (3.6.1)
  power_assert
  tilt (2.1.0)