diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0a542af..f937425 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,16 +15,20 @@ jobs: - jekyll:pages steps: - uses: actions/checkout@v3 - - uses: actions/setup-ruby@v1 + + - uses: ruby/setup-ruby@v1 with: - ruby-version: '2.x' + bundler-cache: true # runs 'bundle install' and caches installed gems automatically + - run: bundle install + - run: | echo $'{\n "experimental": true\n}' | \ sudo tee /etc/docker/daemon.json sudo systemctl restart docker name: 'docker experimental' - - run: docker-template build $DOCKER_REPO --no-push --force --squash + + - run: bundle exec docker-template build $DOCKER_REPO --no-push --force --squash env: RUBYOPT: "-W0" - DOCKER_REPO: "${{join(matrix.env, ' ')}}" + DOCKER_REPO: "${{ join(matrix.env, ' ') }}" diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1a26809..e7406e3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,19 +15,19 @@ jobs: matrix: env: - - - jekyll:4.2.2 + - jekyll:4.3.2 - jekyll:stable - jekyll:latest - jekyll:4.0 - jekyll:4 - - - builder:4.2.2 + - builder:4.3.2 - builder:stable - builder:latest - builder:4.0 - builder:4 - - - minimal:4.2.2 + - minimal:4.3.2 - minimal:stable - minimal:latest - minimal:4.0 @@ -37,23 +37,31 @@ jobs: - jekyll:pages steps: - uses: actions/checkout@v3 - - uses: actions/setup-ruby@v1 + + - uses: ruby/setup-ruby@v1 with: - ruby-version: '2.x' + bundler-cache: true # runs 'bundle install' and caches installed gems automatically + - run: bundle install + - run: | echo $'{\n "experimental": true\n}' | \ sudo tee /etc/docker/daemon.json sudo systemctl restart docker name: 'docker experimental' + - name: 'docker login' - run: | - echo "${{secrets.DOCKER_PASSWORD}}" | docker login \ - --username ${{secrets.DOCKER_USERNAME}} \ - --password-stdin - - run: | - docker-template build $DOCKER_REPO --no-push --force --squash - docker-template push $DOCKER_REPO + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - run: bundle exec docker-template build $DOCKER_REPO --no-push --force --squash + env: + RUBYOPT: "-W0" + DOCKER_REPO: "${{ join(matrix.env, ' ') }}" + + - run: bundle exec docker-template push $DOCKER_REPO env: RUBYOPT: "-W0" - DOCKER_REPO: "${{join(matrix.env, ' ')}}" + DOCKER_REPO: "${{ join(matrix.env, ' ') }}" diff --git a/.ruby-version b/.ruby-version index 24ba9a3..6a81b4c 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.0 +2.7.8 diff --git a/.travis.yml b/.travis.yml index aa60836..0fd707b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ jobs: # -- env: "\ DOCKER_REPO='\ - jekyll:4.2.2 \ + jekyll:4.3.2 \ jekyll:stable \ jekyll:latest \ jekyll:pages \ @@ -43,7 +43,7 @@ jobs: # -- - env: "\ DOCKER_REPO='\ - builder:4.2.2 \ + builder:4.3.2 \ builder:stable \ builder:latest \ jekyll:builder \ @@ -57,7 +57,7 @@ jobs: # -- - env: "\ DOCKER_REPO='\ - minimal:4.2.2 \ + minimal:4.3.2 \ minimal:stable \ minimal:latest \ jekyll:minimal \ diff --git a/Gemfile b/Gemfile index cd5a4c5..6e3e038 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,11 @@ source "https://rubygems.org" +ruby File.read('.ruby-version').strip + gem "docker-template" group :development do - gem 'envygeeks-rubocop' + gem "envygeeks-rubocop" unless ENV["CI"] == "true" gem "travis" gem "pry" diff --git a/opts.yml b/opts.yml index 465b630..5d367b5 100644 --- a/opts.yml +++ b/opts.yml @@ -1,13 +1,14 @@ -base_image: ruby:3.1.1-alpine3.15 +base_image: ruby:3.2.2-alpine3.18 user: jekyll aliases: - latest: 4.2.2 - stable: 4.2.2 - 4.0: 4.2.2 - 4: 4.2.2 + latest: 4.3.2 + stable: 4.3.2 + 4.0: 4.3.2 + 4: 4.3.2 tags: - 4.2.2: stable + 4.3.2: stable pages: pages releases: tag: - pages: 3.8.5 # 05-15-2020 + # pages: 3.8.5 # 05-15-2020 + pages: 3.9.0 # 27.08.2023