merge upstream

Author: graial

.github/workflows/deploy.yml

@@ -0,0 +1,61 @@
+name: Deploy to GitHub Pages
+
+on:
+  push:
+    branches: ["main"]
+  schedule:
+    - cron: "0 7 * * *" # Runs every day at 07:00 UTC time
+    
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+    
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v5
+
+      - name: Build with Jekyll
+        # Outputs to the './_site' directory by default
+        run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
+        env:
+          JEKYLL_ENV: production
+      
+      - name: Upload artifact
+        # Automatically uploads an artifact from the './_site' directory by default
+        uses: actions/upload-pages-artifact@v3
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    runs-on: ubuntu-latest
+    needs: build
+    
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/meetups.yml

@@ -29,20 +29,20 @@ jobs:
       - name: Set up the formatted date, branch name and PR title
         run: |
           echo "FORMATTED_DATE=$(date +'%B %d, %Y')" >> $GITHUB_ENV
-          echo "BRANCH_TO_MERGE=new-meetups-$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+          echo "BRANCH_TO_MERGE=meetups-update-$(date +'%Y-%m-%d')" >> $GITHUB_ENV
           echo "PULL_REQUEST_TITLE=$(cat ./pull_request_title.txt)" >> $GITHUB_ENV
 
       - name: Check if there are any new meetups
         run: |
           if [[ -n $(git diff --name-only _data/meetups.yml) ]]; then
-            echo "NEW_MEETUPS=true" >> $GITHUB_ENV
+            echo "MEETUPS_CHANGED=true" >> $GITHUB_ENV
           else
-            echo "NEW_MEETUPS=false" >> $GITHUB_ENV
+            echo "MEETUPS_CHANGED=false" >> $GITHUB_ENV
           fi
 
       - name: Commit New Meetups
         uses: stefanzweifel/git-auto-commit-action@v5
-        if: ${{ env.NEW_MEETUPS == 'true' }}
+        if: ${{ env.MEETUPS_CHANGED == 'true' }}
         with:
           # Optional. Commit message for the created commit.
           # Defaults to "Apply automatic changes"
@@ -106,7 +106,7 @@ jobs:
           create_branch: true
 
       - name: Create Pull Request
-        if: ${{ env.NEW_MEETUPS == 'true' }}
-        run: gh pr create -B main -H ${{ env.BRANCH_TO_MERGE }} --title "${{ env.PULL_REQUEST_TITLE }}" --body-file "./new_meetups.md"
+        if: ${{ env.MEETUPS_CHANGED == 'true' }}
+        run: gh pr create -B ${{ github.head_ref || github.ref_name }} -H ${{ env.BRANCH_TO_MERGE }} --title "${{ env.PULL_REQUEST_TITLE }}" --body-file "./pull_request_body.md"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/verify.yml

@@ -17,3 +17,6 @@ jobs:
 
       - name: Verify Meetups Data
         run: bundle exec rake verify_meetups
+
+      - name: Verify Website build
+        run: bundle exec jekyll build

.gitignore

@@ -1,5 +1,5 @@
 _site
 .jekyll-metadata
 bin/
-new_meetups.md
 pull_request_title.txt
+pull_request_body.md

.projections.json

@@ -1,16 +1,14 @@
 source 'https://rubygems.org'
 
 ruby File.read(".ruby-version").strip
-#ruby-gemset=ruby-conferences
 
-gem 'danger'
-gem 'danger-commit_lint'
 gem 'html-proofer'
 gem 'jekyll'
 gem 'rake'
 gem 'graphql-client', '~> 0.23.0'
 gem 'frozen_record', '~> 0.27.2'
 gem 'countries', '~> 6.0'
+gem 'icalendar', '~> 2.10'
 
 group :jekyll_plugins do
   gem 'jekyll-feed'

Dangerfile

@@ -24,61 +24,27 @@ GEM
       timers (~> 4.1)
     base64 (0.2.0)
     bigdecimal (3.1.8)
-    claide (1.1.0)
-    claide-plugins (0.9.2)
-      cork
-      nap
-      open4 (~> 1.3)
     colorator (1.1.0)
-    colored2 (3.1.2)
     concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     console (1.16.2)
       fiber-local
-    cork (0.3.0)
-      colored2 (~> 3.1)
     countries (6.0.1)
       unaccent (~> 0.3)
-    danger (9.2.0)
-      claide (~> 1.0)
-      claide-plugins (>= 0.9.2)
-      colored2 (~> 3.1)
-      cork (~> 0.1)
-      faraday (>= 0.9.0, < 3.0)
-      faraday-http-cache (~> 2.0)
-      git (~> 1.7)
-      kramdown (~> 2.3)
-      kramdown-parser-gfm (~> 1.0)
-      no_proxy_fix
-      octokit (~> 5.0)
-      terminal-table (>= 1, < 4)
-    danger-commit_lint (0.0.7)
-      danger-plugin-api (~> 1.0)
-    danger-plugin-api (1.0.0)
-      danger (> 2.0)
     drb (2.2.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    faraday (2.7.4)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-http-cache (2.4.1)
-      faraday (>= 0.8)
-    faraday-net_http (3.0.2)
     ffi (1.17.0)
     fiber-local (1.0.0)
     fiber-storage (1.0.0)
     forwardable-extended (2.6.0)
     frozen_record (0.27.2)
       activemodel
-    git (1.13.2)
-      addressable (~> 2.8)
-      rchardet (~> 1.8)
-    google-protobuf (4.27.1)
+    google-protobuf (4.27.5)
       bigdecimal
       rake (>= 13)
     graphql (2.3.14)
@@ -100,6 +66,9 @@ GEM
     http_parser.rb (0.8.0)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
+    icalendar (2.10.2)
+      ice_cube (~> 0.16)
+    ice_cube (0.17.0)
     io-event (1.1.6)
     jekyll (4.3.3)
       addressable (~> 2.4)
@@ -135,15 +104,9 @@ GEM
     mercenary (0.4.0)
     mini_portile2 (2.8.6)
     minitest (5.25.1)
-    nap (1.1.0)
-    no_proxy_fix (0.1.2)
     nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    octokit (5.6.1)
-      faraday (>= 1, < 3)
-      sawyer (~> 0.9)
-    open4 (1.3.4)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     pdf-reader (2.11.0)
@@ -159,19 +122,14 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rchardet (1.8.0)
     rexml (3.3.6)
       strscan
     rouge (4.3.0)
     ruby-rc4 (0.1.5)
-    ruby2_keywords (0.0.5)
     safe_yaml (1.0.5)
     sass-embedded (1.77.5)
       google-protobuf (>= 3.25, < 5.0)
       rake (>= 13)
-    sawyer (0.9.2)
-      addressable (>= 2.3.5)
-      faraday (>= 0.17.3, < 3)
     securerandom (0.3.1)
     strscan (3.1.0)
     terminal-table (3.0.2)
@@ -193,11 +151,10 @@ PLATFORMS
 
 DEPENDENCIES
   countries (~> 6.0)
-  danger
-  danger-commit_lint
   frozen_record (~> 0.27.2)
   graphql-client (~> 0.23.0)
   html-proofer
+  icalendar (~> 2.10)
   jekyll
   jekyll-feed
   rake

Gemfile

@@ -38,9 +38,8 @@ The list of events is driven by the conferences file in the `_data` directory -
 
 **Conferences**
 
-The file to be changed is `_data/conferences.yml`. It is NOT order-dependent.
-Put your conference in the YAML file at the end.
-The page will sort the conferences by `start_date`.
+The file to be changed is `_data/conferences.yml`.
+This file is order-dependent. Put your conference in the YAML file sorted by its `start_date`.
 
 Here is a list of the keys that can be used:
 
@@ -60,19 +59,20 @@ Extra keys for the upcoming events:
 * `cfp_open_date`: The date when the CFP was opened - ISO8601 formatted (yyyy-mm-dd).
 * `cfp_close_date`: If there is a CFP deadline, enter that here - ISO8601 formatted (yyyy-mm-dd).
 * `cfp_link`: A link to the CFP submission page.
-* `status`:  Typically you want to put "Canceled", "Postponed" or "To be announced" here.
-* `date_precision`: Controls the precision of the `start_date` and `end_date` when the conference dates aren't announced just yet but it's confirmed that the conference is happening. Possible values: `full` (implicit default), `month` or `year`. The `start_date` and `end_date` fields still need to be fully formatted ISO8601 dates, you can put the last day of the month/year in it so it also gets ordered properly.
-* `announced_on`: The date on which the conference was announced - ISO8601 formatted (yyyy-mm-dd). This date is used as the publish date for the [RSS feed](https://rubyconferences.org/feed.xml) so people can stay up to date with newly announced conferences.
+* `status`:  Typically you want to put "Cancelled", "Postponed" or "To be announced" here.
+* `date_precision`: Controls the precision of the `start_date` and `end_date` when the conference dates aren't announced just yet, but it's confirmed that the conference is happening. Possible values: `full` (implicit default), `month` or `year`. The `start_date` and `end_date` fields still need to be fully formatted ISO8601 dates, you can put the last day of the month/year in it so it also gets ordered properly.
+* `announced_on`: The date on which the conference was announced - ISO8601 formatted (yyyy-mm-dd). This date is used as the publishing date for the [RSS feed](https://rubyconferences.org/feed.xml) so people can stay up to date with newly announced conferences.
 
 Extra keys for the past events:
 
 * `video_link`: A url to the videos for the event.
 
 **Meetups**
 
-The file to be changed is `_data/meetups.yml`. It is NOT order-dependent.
-Put your meetup in the YAML file at the end.
-The page will sort the conferences by `date`.
+The file to be changed is `_data/meetups.yml`.
+This file is order-dependent. Put your meetup in the YAML file sorted by its date.
+Otherwise, put the meetup at the end of the YAML file and run `rake sort_meetups`.
+Please make sure to preserve any comments in the YAML file.
 
 Here is a list of the keys that can be used:
 
@@ -87,6 +87,7 @@ Here is a list of the keys that can be used:
   * ZZZ - timezone (e.g. CDT or EST)
 * `end_time`: The end time of the event - ISO8601 formatted as (hh:mm:ss ZZZ) using same values as `start_time`
 * `url`: The url for the event.
+* `status`:  Typically you want to put "Cancelled" or "Postponed" here.
 
 ## Getting started