Skip to content

Commit

Permalink
replace all 2024 with 2025
Browse files Browse the repository at this point in the history
  • Loading branch information
Shayan Monadjemi committed Oct 26, 2024
1 parent 7246c73 commit 0066eac
Show file tree
Hide file tree
Showing 803 changed files with 477 additions and 91,014 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,18 @@ jobs:
git switch -f vis2023
make new2023
## BUILD THIS YEAR (currently: vis2024)
- name: Build previous year (2024)
run: |
git switch -f vis2024
make new2024
## BUILD THIS YEAR (currently: vis2025)
## ./scripts/fix_file_extensions.sh moves some evergreen content from current year
## ∟ also only check out the tag linked to the triggering event
- name: Build this year (2024) + deploy
- name: Build this year (2025) + deploy
env:
IEEEVIS_AWS_USER: default
AWS_DISTRIBUTION_ID: ${{ secrets.aws_distribution_id_production }}
run: |
git switch -f --detach ${{ github.event.release.tag_name }}
make release2024
make release2025
16 changes: 11 additions & 5 deletions .github/workflows/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name: build staging
on:
push:
# build staging whenever someone pushes to master (archive), previous year's (vis2019,
# vis2020, vis2021, vis2022, vis2023), or this year's site (vis2024)
# vis2020, vis2021, vis2022, vis2023, vis2024), or this year's site (vis2025)
branches:
- master
- vis2019
Expand All @@ -17,6 +17,7 @@ on:
- vis2022
- vis2023
- vis2024
- vis2025

jobs:
build:
Expand Down Expand Up @@ -84,14 +85,19 @@ jobs:
git switch -f vis2023
make new2023
## BUILD THIS YEAR (currently: vis2024)
- name: Build previous year (2024)
run: |
git switch -f vis2024
make new2024
## BUILD THIS YEAR (currently: vis2025)
## ./scripts/fix_file_extensions.sh moves some evergreen content from current year
- name: Build this year (2024) + deploy
- name: Build this year (2025) + deploy
env:
IEEEVIS_AWS_USER: default
AWS_DISTRIBUTION_ID: ${{ secrets.aws_distribution_id_staging }}
run: |
git switch -f vis2024
make staging2024
git switch -f vis2025
make staging2025
20 changes: 10 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ NEW_BUCKET=redesign.ieeevis.org
PRODUCTION_BRANCH=production
STAGING_BRANCH=master
NEW_BRANCH=development
2024_BRANCH=vis2024
2024_RELEASE=vis2024-release
2025_BRANCH=vis2025
2025_RELEASE=vis2025-release

all: site

Expand All @@ -21,10 +21,10 @@ newsite:
./scripts/fix_file_extensions.sh
./scripts/buildyear.sh

new2024:
new2025:
npm install
npm run-script build
bundle exec jekyll build -d ./_site/year/2024
bundle exec jekyll build -d ./_site/year/2025
./scripts/fix_file_extensions.sh

production: site
Expand All @@ -37,18 +37,18 @@ stagingnew: newsite
cd _site && ../scripts/sync_with_s3_boto.py $(NEW_BRANCH) $(STAGING_BUCKET)

# don't want to index staging...
staging2024: new2024
staging2025: new2025
cp -f robots.txt -t _site/
cd _site && ../scripts/sync_with_s3_boto.py $(2024_BRANCH) $(STAGING_BUCKET)
cd _site && ../scripts/sync_with_s3_boto.py $(2025_BRANCH) $(STAGING_BUCKET)

productionnew: newsite
cd _site && ../scripts/sync_with_s3_boto.py $(NEW_BRANCH) $(PRODUCTION_BUCKET)

production2024: new2024
cd _site && ../scripts/sync_with_s3_boto.py $(2024_BRANCH) $(PRODUCTION_BUCKET)
production2025: new2025
cd _site && ../scripts/sync_with_s3_boto.py $(2025_BRANCH) $(PRODUCTION_BUCKET)

release2024: new2024
cd _site && ../scripts/sync_with_s3_boto.py $(2024_RELEASE) $(PRODUCTION_BUCKET)
release2025: new2025
cd _site && ../scripts/sync_with_s3_boto.py $(2025_RELEASE) $(PRODUCTION_BUCKET)

new: newsite
cd _site && ../scripts/sync_with_s3_boto.py $(NEW_BRANCH) $(NEW_BUCKET)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Hi! This is the Jekyll version of the [IEEE VIS website](http://ieeevis.org).

The `vis2024` branch (the page you're currently viewing) is the current year's website.
The `vis2025` branch (the page you're currently viewing) is the current year's website.

To edit files in other years, check out the other `vis*` branches. Click the below links to teleport:
- [vis2023](https://github.com/ieee-vgtc/ieeevis.org/tree/vis2023) - the 2023 redesign
Expand All @@ -14,7 +14,7 @@ To edit files in other years, check out the other `vis*` branches. Click the be

## Contributing

If you're contributing content, but not administrating the website itself, you will want to follow the [contributor's guide](http://ieeevis.org/year/2024/info/contributing).
If you're contributing content, but not administrating the website itself, you will want to follow the [contributor's guide](http://ieeevis.org/year/2025/info/contributing).

## Building

Expand Down
52 changes: 26 additions & 26 deletions _data/carousel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,43 +5,43 @@
# image: "2024-hilton.jpg"
# active: "active"

- title: "IEEE VIS 2024 will now be fully virtual"
button-text: "Register Now"
button-url: "/info/registration/conference-registration"
image: "virtual_tree.png"
active: "active"
# - title: "IEEE VIS 2024 will now be fully virtual"
# button-text: "Register Now"
# button-url: "/info/registration/conference-registration"
# image: "virtual_tree.png"
# active: "active"

# - title: "The Road to VIS 2024 - Decisions"
# button-text: "Latest Blog Post"
# button-url: "/blog/vis-2024-OPC-blog-decisions_2"
# image: "road_to_vis24.png"

- title: "Keynote Speaker: Dr. Bill Pike"
button-text: "Read More"
button-url: "/info/keynote-speaker"
image: "bill-pike-carousel.jpg"
# - title: "Keynote Speaker: Dr. Bill Pike"
# button-text: "Read More"
# button-url: "/info/keynote-speaker"
# image: "bill-pike-carousel.jpg"

- title: "Capstone Speaker: Professor Catherine D'Ignazio"
button-text: "Read More"
button-url: "/info/capstone-speaker"
image: "catherine-dignazio-carousel.jpg"
# - title: "Capstone Speaker: Professor Catherine D'Ignazio"
# button-text: "Read More"
# button-url: "/info/capstone-speaker"
# image: "catherine-dignazio-carousel.jpg"

- title: "IEEE VIS is made possible by our supporters"
button-text: "Become a supporter"
button-url: "/supporters"
image: "09212024-vis-supporters.png"
# - title: "IEEE VIS is made possible by our supporters"
# button-text: "Become a supporter"
# button-url: "/supporters"
# image: "09212024-vis-supporters.png"

- title: "IEEE VIS 2024 Swag Shop Now Open!"
button-text: "Read More"
button-url: "/info/swag"
image: "vis2024-swag-carousel.png"
# - title: "IEEE VIS 2024 Swag Shop Now Open!"
# button-text: "Read More"
# button-url: "/info/swag"
# image: "vis2024-swag-carousel.png"


# - title: "IEEE VIS 2024 in St. Pete Beach, Florida"
# image: "florida_splash_image-small.png"
# button-text: "Read More"
# button-url: "/destination"
# active: "active"
- title: "IEEE VIS 2025 in Vienna, Austria"
image: "florida_splash_image-small.png"
button-text: "Read More"
button-url: "/destination"
active: "active"

# - title: "Latest Update on IEEE VIS 2024 Conference Format"
# button-text: "Latest Update"
Expand Down
Loading

0 comments on commit 0066eac

Please sign in to comment.