Skip to content

Commit

Permalink
Merge pull request #22 from increments/docker/node-20.11.0
Browse files Browse the repository at this point in the history
Bump node from 18.17.1 to 20.11.0
  • Loading branch information
kyntk authored Feb 9, 2024
2 parents 4c05c82 + 63eb30f commit 9e76eb0
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
ruby: [2.7]
node: [16, 17, 18]
node: [18, 20]
env:
BUNDLE_GEMFILE: test.gemfile
steps:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ Unreleased

<!-- Add descriptions of changes here -->

* Add support for Node v20 and drop support for Node v17 or before [22](https://github.com/increments/camo/pull/22)

3.1.0
=====

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.17.1
FROM node:20.11.0

RUN apt-get update && \
apt-get -y clean && \
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "3.1.0",
"dependencies": {},
"engines": {
"node": "^16 || ^17 || ^18"
"node": "^18 || ^20"
},
"scripts": {
"build": "coffee -c server.coffee"
Expand Down
2 changes: 1 addition & 1 deletion server.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ process_url = (url, transferredHeaders, resp, remaining_redirects) ->
# decode a string of two char hex digits
hexdec = (str) ->
if str and str.length > 0 and str.length % 2 == 0 and not str.match(/[^0-9a-f]/)
buf = new Buffer(str.length / 2)
buf = new Buffer.alloc(str.length / 2)
for i in [0...str.length] by 2
buf[i/2] = parseInt(str[i..i+1], 16)
buf.toString()
Expand Down
2 changes: 1 addition & 1 deletion server.js

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

2 changes: 1 addition & 1 deletion test/servers/redirect_without_location.ru
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class ProxyTestServer
def call(env)
[302, {"Content-Type" => "image/foo"}, "test"]
[302, {"Content-Type" => "image/foo"}, ["test"]]
end
end

Expand Down

0 comments on commit 9e76eb0

Please sign in to comment.