Skip to content

Commit

Permalink
Update dependencies matrix (#6)
Browse files Browse the repository at this point in the history
* Ruby 2.7.3->2.7.4 in dockerfile

* GH Pages 226->228 in Dockerfile

* node version 16->18 in Dockerfile

* Update matrix to use pairs where appropriate

* update env variables to use the new matrix values

* spacing
  • Loading branch information
SeanKilleen authored Aug 3, 2023
1 parent e016588 commit 0315e78
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@ jobs:
name: "Build and Release"
strategy:
matrix:
RUBY_VERSION: [2.7.3]
NODE_MAJOR_VERSION: [16, 18]
GITHUB_PAGES_VERSION: [226]
VERSIONS: [ {ruby: 2.7.3, ghpages: 226}, {ruby: 2.7.4, ghpages: 228}]
NODE_MAJOR_VERSION: [16,18,20]
runs-on: ubuntu-latest
env:
RUBY_VERSION: ${{ matrix.RUBY_VERSION }}
RUBY_VERSION: ${{ matrix.VERSIONS.ruby }}
NODE_MAJOR_VERSION: ${{ matrix.NODE_MAJOR_VERSION }}
GITHUB_PAGES_VERSION: ${{ matrix.GITHUB_PAGES_VERSION }}
GITHUB_PAGES_VERSION: ${{ matrix.VERSIONS.ghpages }}

steps:
- name: Lowercase repo for IMAGE_NAME
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Adapted from https://github.com/timbru31/docker-ruby-node/blob/master/2.7/16/Dockerfile
# Using dependency references from https://pages.github.com/versions/

# 2.7.3 is GitHub Pages 226 compatible
ARG RUBY_VERSION=2.7.3
# 2.7.4 is GitHub Pages 228 compatible
ARG RUBY_VERSION=2.7.4

FROM ruby:${RUBY_VERSION}

# NOTE: These args need to stay below the FROM line in order for Docker to recognize them.
ARG BUILD_DATE
ARG VCS_REF
ARG GH_PAGES_VERSION=226
ARG NODE_MAJOR_VERSION=16
ARG GH_PAGES_VERSION=228
ARG NODE_MAJOR_VERSION=18

RUN echo "RUBY_VERSION=${RUBY_VERSION}"
RUN echo "BUILD_DATE=${BUILD_DATE}"
Expand Down

0 comments on commit 0315e78

Please sign in to comment.