diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 9efb525..0cc6013 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -17,20 +17,21 @@ jobs: - uses: actions/cache@v4 with: - path: vendor/bundle - key: ${{ runner.os }}-brandonb.ca-${{ hashFiles('**/Gemfile.lock') }} + path: .awspublish-brandonb-web-media + key: ${{ runner.os }}-awspublish-cache-${{ hashFiles('**/.awspublish-brandonb-web-media') }} restore-keys: | - ${{ runner.os }}-brandonb.ca- + ${{ runner.os }}-awspublish-cache- - name: Setup Ruby uses: ruby/setup-ruby@v1 with: ruby-version: '3' + bundler-cache: true - uses: actions/setup-node@v4 with: node-version: 20 - cache-dependency-path: 'package-lock.json' + cache: 'npm' - name: Install ruby dependencies run: gem install bundler && bundle install diff --git a/brandonb.ca/gulpfile.babel.js b/brandonb.ca/gulpfile.babel.js index 0baee5e..7ca94e2 100755 --- a/brandonb.ca/gulpfile.babel.js +++ b/brandonb.ca/gulpfile.babel.js @@ -2,6 +2,7 @@ import { spawn } from 'child_process' import path from 'path' import { fromIni } from '@aws-sdk/credential-provider-ini' +import { fromEnv } from '@aws-sdk/credential-provider-env' import browsersync from 'browser-sync' import { deleteAsync } from 'del' import gulp from 'gulp' @@ -291,7 +292,7 @@ function s3_media() { params: { Bucket: configProd.deploy.s3.bucketMedia, }, - credentials: fromIni({ profile: 'personal' }), + credentials: fromIni({ profile: 'personal' }) || fromEnv(), }, { 'Cache-Control': 'max-age=315360000, no-transform, public',