Skip to content

Commit

Permalink
update ruby to 3.3 and simplify GitHub Actions to one yml
Browse files Browse the repository at this point in the history
  • Loading branch information
joshtynjala committed Sep 24, 2024
1 parent ec7b3f1 commit f8491c9
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 48 deletions.
25 changes: 4 additions & 21 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Deploy
name: Build & Deploy

on:
push:
branches: [ master ]
on: [push, pull_request]

jobs:
build:
Expand All @@ -13,14 +11,9 @@ jobs:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.3
bundler-cache: true

# - name: Install dependencies
# run: |
# sudo apt-get install zopfli
# _scripts/install.sh

- name: Install dependencies
run: |
_scripts/install.sh
Expand All @@ -29,19 +22,9 @@ jobs:
run: |
_scripts/build.sh
# - name: Configure AWS Credentials
# uses: aws-actions/configure-aws-credentials@v1
# with:
# aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
# aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
# aws-region: us-west-2

# - name: Deploy to AWS
# run: |
# _scripts/deploy.sh

- name: Deploy to GitHub Pages
uses: peaceiris/actions-gh-pages@v3
if: ${{ github.repository == 'openfl/www.openfl.org' && github.ref == 'master' && github.event_name != 'pull_request' }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./_site
Expand Down
26 changes: 0 additions & 26 deletions .github/workflows/test-deploy.yml

This file was deleted.

2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ group :jekyll_plugins do
gem 'pygments.rb'
gem 'kramdown-parser-gfm'
end

gem "webrick", "~> 1.8"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This is the source for https://www.openfl.org.
You can build the site using [Jekyll](https://www.jekyllrb.com). It should work in a Unix environment, either from Linux, macOS or the Ubuntu Bash Shell for Windows. Make sure that Ruby is installed, and install Bundler (`gem install bundler`), then run the following in the openfl.org directory:

bundle install
jekyll serve
bundle exec jekyll serve

If you wish to add a title to the showcase, each title has it's own file under "\_showcase". Each showcase item references an image name, which is expected to be located under "images/large" and "images/small" with the same name. In order to allow clients, developers and publishers to have links, the "\_data" folder has files to match each name with a matching URL.

Expand Down

0 comments on commit f8491c9

Please sign in to comment.