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

BREAKING CHANGE: fix: update default branch to install plugins from #25

Merged
merged 2 commits into from
Mar 13, 2023
Merged

BREAKING CHANGE: fix: update default branch to install plugins from #25

merged 2 commits into from
Mar 13, 2023

Conversation

MikkCZ
Copy link
Contributor

@MikkCZ MikkCZ commented Mar 12, 2023

Change the default branch to install plugins from to main, but also enable to change it to any other branch or tag.

fix #24

Verified

This commit was signed with the committer’s verified signature.
MikkCZ Michal Stanke
Change the default branch to install plugins from to `main`, but also enable to change it to any other branch or tag.
@MikkCZ
Copy link
Contributor Author

MikkCZ commented Mar 12, 2023

Now I realize, changing from master to main might be a breaking change for someone. But it fixes installation of the "official" plugins from https://github.com/pretalx/.

@MikkCZ MikkCZ changed the title fix: update default branch to install plugins from BREAKING CHANGE: fix: update default branch to install plugins from Mar 12, 2023
Copy link
Member

@rixx rixx left a comment

Choose a reason for hiding this comment

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

Absolutely sensible, thank you.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
…ing-plugins
@rixx rixx merged commit 46755f7 into pretalx:master Mar 13, 2023
@MikkCZ MikkCZ deleted the issue-24-switch-to-main-branch-for-installing-plugins branch March 13, 2023 12:48
@MikkCZ
Copy link
Contributor Author

MikkCZ commented Mar 13, 2023

@rixx I am afraid the merge did not go as planned. The module parameters are got duplicated

git:
repo: "{{ item.repository }}"
dest: ~{{ pretalx_system_user }}/plugins/{{ item.name }}
version: "{{ item.version if item.version is defined else 'main' }}"
key_file: ~{{ pretalx_system_user }}/.ssh/id_rsa
dest: "{{ pretalx_system_home }}/plugins/{{ item.name }}"
version: "{{ item.version if item.version is defined else 'main' }}"
key_file: "{{ pretalx_system_home }}/.ssh/id_rsa"
accept_hostkey: yes

@MikkCZ
Copy link
Contributor Author

MikkCZ commented Mar 13, 2023

The result should be

git:
  repo: "{{ item.repository }}" 
  dest: "{{ pretalx_system_home }}/plugins/{{ item.name }}" 
  version: "{{ item.version if item.version is defined else 'main' }}" 
  key_file: "{{ pretalx_system_home }}/.ssh/id_rsa" 
  accept_hostkey: yes 

I am not around my laptop with access to GitHub, so I cannot create a new PR right now.

@rixx
Copy link
Member

rixx commented Mar 13, 2023

Oh GitHub, thy merge conflicts.

rixx added a commit that referenced this pull request Mar 13, 2023
@rixx
Copy link
Member

rixx commented Mar 13, 2023

Fixed in 2cae113.

Somewhat an illustration of why I like small PRs in theory but not in bulk practice. It never seems to end quite well, unless provided with a strict list of order or multiple rebases (and GitHub refused to rebase this one, and I was too lazy to check it out locally).

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.

[bug] Installtion of pretalx_plugins is hardoced to master branch
2 participants