From 18e4215f06cba164e00748f23c3e67a2673f8eb6 Mon Sep 17 00:00:00 2001
From: Josh Tynjala <joshtynjala@bowlerhat.dev>
Date: Tue, 24 Sep 2024 07:14:51 -0700
Subject: [PATCH] actions: Ruby 3.3 and simplified to a single yml

Updated README to match www.openfl.org
---
 .github/workflows/deploy.yml      | 25 ++++---------------------
 .github/workflows/test-deploy.yml | 26 --------------------------
 .gitignore                        |  1 +
 Gemfile                           |  2 ++
 README.md                         | 26 +++++++-------------------
 5 files changed, 14 insertions(+), 66 deletions(-)
 delete mode 100644 .github/workflows/test-deploy.yml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 1ee0e087..c97ca546 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,8 +1,6 @@
-name: Deploy
+name: Build & Deploy
 
-on:
-  push:
-    branches: [ master ]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -20,7 +18,7 @@ jobs:
 
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.3
         bundler-cache: true
 
     - uses: krdlab/setup-haxe@v1
@@ -46,11 +44,6 @@ jobs:
         mkdir api
         cp -a _lime-git/docs/pages/. api/
 
-    # - name: Install dependencies
-    #   run: |
-    #     sudo apt-get install zopfli
-    #     _scripts/install.sh
-
     - name: Install dependencies
       run: |
         _scripts/install.sh
@@ -59,19 +52,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/lime.openfl.org' && github.ref == 'refs/heads/master' && github.event_name != 'pull_request' }}
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         publish_dir: ./_site
diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
deleted file mode 100644
index 694d5521..00000000
--- a/.github/workflows/test-deploy.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Test deployment
-
-on:
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  test-deploy:
-
-    name: Test deployment
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-        bundler-cache: true
-
-    - name: Install dependencies
-      run: |
-        _scripts/install.sh
-    
-    - name: Build site
-      run: |
-        _scripts/build.sh
diff --git a/.gitignore b/.gitignore
index 090aa965..25971387 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 _site/*
 *.DS_Store*
 .sass-cache
+Gemfile.lock
diff --git a/Gemfile b/Gemfile
index e32900b7..ac800406 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,3 +12,5 @@ group :jekyll_plugins do
    gem 'pygments.rb'
    gem 'kramdown-parser-gfm'
 end
+
+gem "webrick", "~> 1.8"
\ No newline at end of file
diff --git a/README.md b/README.md
index 328bb4b8..4df06844 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,11 @@
-# Jekyll Doc Theme
+Lime.OpenFL.org
+===============
 
-Go to [the website](https://aksakalli.github.io/jekyll-doc-theme/) for detailed information and demo.
+This is the source for https://lime.openfl.org.
 
-## Running locally
+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:
 
-You need Ruby and gem before starting, then:
+	bundle install
+	bundle exec jekyll serve
 
-```bash
-# install bundler
-gem install bundler
-
-# clone the project
-git clone https://github.com/aksakalli/jekyll-doc-theme.git
-cd jekyll-doc-theme
-
-# run jekyll with dependencies
-bundle exec jekyll serve
-```
-
-## License
-
-Released under [the MIT license](LICENSE).
+Thanks for using Lime!
\ No newline at end of file