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

Update main (mainly to push to the new docker registries) #221

Merged
merged 5 commits into from
Jun 19, 2024

Conversation

SuperVK
Copy link
Member

@SuperVK SuperVK commented Jun 19, 2024

Changelog:

SuperVK and others added 5 commits June 16, 2024 01:29
* fix: update devcontainer postCreateCommand

* chore: rename .env-example to .env.example for consistency

* docs: added dev quick start to README

* fix: also change the devcontainer commands to use .env.example

* feat: auto start point of sale on port 5174
* fix: Prevent deleted users from breaking user mapping on FineView

* fix: Prevent deleted users from breaking user mapping on FineView

* fix: added package-lock.json

* fix: re-added package-lock

* fix: removed unused and broken dependency

* fix: yes

* refactor: removed some commented code

* revert: readded package-lock.json

* revert: rolled back to old main.ts
* ci(dashboard-docker): Dockerize from the whole monorepo

* ci(pos-docker): Update pos dockerfile to account of monorepo

* chore(pos): rename package.json

* chore: remove package locks that are not used anymore

* ci(dockerize): update workflows to dockerize on the root dir

* ci: update to node:20
Copy link

Triggered from #221 by @​SuperVK.

Checking if we can fast forward main (60d20e7) to develop (0e19fa0).

Target branch (main):

commit 60d20e7343d1ced93f13727698f3bcc091686514 (HEAD -> main, origin/main)
Author: Victor Klomp <[email protected]>
Date:   Fri Jun 14 14:59:38 2024 +0200

    Fix/workflow dispatch (#210)
    
    * fix: push on workflow_dispatch
    
    * fix: Push on workflow_dispatch

Pull request (develop):

commit 0e19fa05dad0ed831d76b5cf6e951c8606907add (pull_request/develop)
Author: Victor Klomp <[email protected]>
Date:   Wed Jun 19 19:59:04 2024 +0200

    hotfix: Add context to dockerize action

It is possible to fast forward main (60d20e7) to develop (0e19fa0). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward main to develop.

Copy link
Contributor

@JustSamuel JustSamuel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@SuperVK
Copy link
Member Author

SuperVK commented Jun 19, 2024

/fast-forward

Copy link

Triggered from #221 (comment) by @​SuperVK.

Trying to fast forward main (60d20e7) to develop (0e19fa0).

Target branch (main):

commit 60d20e7343d1ced93f13727698f3bcc091686514 (HEAD -> main, origin/main)
Author: Victor Klomp <[email protected]>
Date:   Fri Jun 14 14:59:38 2024 +0200

    Fix/workflow dispatch (#210)
    
    * fix: push on workflow_dispatch
    
    * fix: Push on workflow_dispatch

Pull request (develop):

commit 0e19fa05dad0ed831d76b5cf6e951c8606907add (pull_request/develop)
Author: Victor Klomp <[email protected]>
Date:   Wed Jun 19 19:59:04 2024 +0200

    hotfix: Add context to dockerize action

Fast forwarding main (60d20e7) to develop (0e19fa0).

$ git push origin 0e19fa05dad0ed831d76b5cf6e951c8606907add:main
To https://github.com/GEWIS/sudosos-frontend.git
   60d20e7..0e19fa0  0e19fa05dad0ed831d76b5cf6e951c8606907add -> main

@github-actions github-actions bot merged commit 0e19fa0 into main Jun 19, 2024
7 checks passed
Copy link

🎉 This PR is included in version 1.0.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants