Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release PR#2 Release version will load dynamically from version.json #1592

Merged
merged 5 commits into from
Oct 1, 2024

Conversation

ihsaan-ullah
Copy link
Collaborator

@ihsaan-ullah ihsaan-ullah commented Sep 20, 2024

@ mention of reviewers

@Didayolo @ObadaS

A brief description of the purpose of the changes contained in this PR.

This PR makes the version number to show dynamically from the version.json file.

Issues this PR resolves

A checklist for hand testing

  • check that when you have json file it loads the correct version and you can click and go to the release page

Checklist

  • Code review by me
  • Hand tested by me
  • I'm proud of my work
  • Code review by reviewer
  • Hand tested by reviewer
  • CircleCi tests are passing
  • Ready to merge

@ihsaan-ullah ihsaan-ullah mentioned this pull request Sep 21, 2024
@ObadaS
Copy link
Collaborator

ObadaS commented Sep 24, 2024

To summarize the automation of the versions.json file:

  1. After we merge develop into master, we create a Github release to describe all the changes that happened, bumping the version.
  2. Once we create a new Github release, Github actions will launch a workflow to change the content of the version.json file, updating it then merging it into develop directly.
  3. We will then need to do another Develop -> Master merge to update the version.json file. This will allow the website to dynamically show the latest version number (it won't show it after our first develop -> master merge)

To test this once it's released, I will wait until the changes have been merged to publish the newest release notes, so that we can test the Github actions script as well as the new workflow we will have to follow after each new version.

@Didayolo Didayolo changed the title Relsaese PR#2 Release version will load dynamically from version.json Release PR#2 Release version will load dynamically from version.json Sep 26, 2024
@Didayolo Didayolo self-assigned this Oct 1, 2024
@Didayolo
Copy link
Member

Didayolo commented Oct 1, 2024

To summarize the automation of the versions.json file:

1. After we merge `develop` into ` master`, we create a Github release to describe all the changes that happened, bumping the version.

2. Once we create a new Github release, Github actions will launch a workflow to change the content of the `version.json` file, updating it then merging it into `develop` directly.

3. We will then need to do another `Develop -> Master` merge to update the `version.json` file. This will allow the website to dynamically show the latest version number (it won't show it after our first `develop -> master` merge)

To test this once it's released, I will wait until the changes have been merged to publish the newest release notes, so that we can test the Github actions script as well as the new workflow we will have to follow after each new version.

@ObadaS Couldn't we edit version.json on develop directly before creating the release? Then we avoid multiple merging. The problem is that the URL of the release would not exist yet at the moment of the merge develop --> master.

@Didayolo Didayolo merged commit 7ced144 into develop Oct 1, 2024
1 check passed
@Didayolo Didayolo deleted the version_json_file branch October 1, 2024 20:51
Didayolo added a commit that referenced this pull request Oct 11, 2024
* autorun collectstatic when django container starts, added caddy_data and caddy_config to gitignore

* programs and datasets bug fixed

* if condition format fixed

* Downloading submissions witha stream v1

* updated toml file with python version and bpython version, deleted lock file, update dockerfile to not copy lock file and to generate lock file in the docker build

* Change base image for Dockerfile.flower (#1520)

* Change base image for Dockerfile.flower

* Remove platform argument

* Resources bundles dumps (#1505)

* Add a Bundles tab in Resources view

* add dump single and multiple deletion mechanism

* add competition title in bundle name + add competition link in bundle resource tab

* Update datasets.py (flake8)

---------

Co-authored-by: OhMaley <tristanmary2@gmail.com>
Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

* Improve formatting

* leaderboard api 500 error resolved (#1527)

* leaderboard api 500 error resolved

* flake issues resolved

* Changed submission name to add ID when downloading many submissions (#1565)

* changed submission name to add ID

* Flake8 white space fix

---------

Co-authored-by: Nicolas HOMBERG <nicolashomberg@gricad-nh.u-ga.fr>

* Server Status:  submissions limit removed (#1562)

* server status submissions limit removed, pagination added, monitor queues separated

* renamed server status title to recent submissions

* Email template fixes (#1567)

* email logo fixed, some changes in email text

* participant side email templates updated

* task dataset/program removal fixed

* Updated docker-compose to docker compose

* whiltelist emails leaking fixed (#1560)

* competition whitelist feature added

* updated whitelist

* Update whitelist note

* whiltelist emails leaking fixed

* Remove conflict

---------

Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

* Updates to server_status and monitor_queues (#1568)

* server_status and monitor_queues pages secured

* Update monitor_queues.html

* [Feature] Delete orphan files (#1575)

* Add button for orphan files deletion + API routes and views

* Fix flake8 formatting

---------

Co-authored-by: OhMaley <tristanmary2@gmail.com>

* Fix string concat in case of no email in analytics api

* Poetry error tentative fix (#1588)

* Poetry error tentative fix

* RabbitMQ static image in Dockerfile.rabbitmq to fix a recent bug

* Reverted RabbitMQ image change

* Fix Rabbit version

---------

Co-authored-by: Obada Haddad <obada.haddad@lisn.fr>
Co-authored-by: didayolo <adrien.pavao@gmail.com>

* `Release PR#1` - Display release version in Codabench footer (#1583)

* release version added to header

* version moved to footer

* Minor UI change

---------

Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

* `Release PR#2` Release version will load dynamically from version.json (#1592)

* release version added to header

* version moved to footer

* version on the website is now dynamic and will be loaded from the version.json file

---------

Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

* `Release PR#3` created workflow for new releases (#1584)

* created workflow for new releases

* version json file added

* typo fix

* Update release-version-update.yml

* Included realease url to navigate user to the url on click on the website

* release json updated

---------

Co-authored-by: Obada Haddad <obada.haddad@lisn.fr>
Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

* Updates Sept 15-22 2024 (#1593)

* jinja and pillow

* jinja and pillow

* Adding Versino_Bump_Instruction_README

* Version_Bumps file

* Version_Bumps file and req_treeFile updates

* gunicorn from 20.0.4 to 22.0.0

* Bump requests from 2.20.0 to 2.32.2

* Bump django from 2.2.17 to 2.2.18

* Bump django from 2.2.18 to 2.2.19 and to 3.2.25 eventually

* Bump django from 2.2.19 to 2.2.20

* Bump django from 2.2.20 to 2.2.25

* Bump django from 2.2.25 to 2.2.28

* Bump django from 2.2.25 to 2.2.28

* Version_Bumps.md text

* Update Dockerfile (upgrade Python)

* checking in some outstanding changes

* Remove Version Bumps

* removing version bumbs

---------

Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

* organizers can now delete forum posts (#1613)

Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

* bundles renamed to competition bundles, swapped postions of bundles and tasks (#1591)

Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

---------

Co-authored-by: Ihsan Ullah <ihsan2131@gmail.com>
Co-authored-by: Nicolas HOMBERG <nicolashomberg@gricad-nh.u-ga.fr>
Co-authored-by: OhMaley <tristanmary2@gmail.com>
Co-authored-by: Obada Haddad <obada.haddad@lisn.fr>
Co-authored-by: Obada Haddad-Soussac <osobada.03@hotmail.fr>
Co-authored-by: Benjamin Bearce <bbearce@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants