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.

Sign up for GitHub

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

Jump to bottom

fix:[close #183] Restrict differ to dev branch only #207

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix:[close #183] Restrict differ to dev branch only #207

wants to merge 1 commit into from

Conversation

jardon
Copy link
Member

@jardon jardon commented Sep 3, 2024 •
edited
Loading

  • Add branches definition to differ workflow
  • Image tag now pulls using the branch name

Tested here on commit 0e4c7ce

closes #183

kbdharun
kbdharun reviewed Sep 4, 2024
View reviewed changes
Copy link
Member

@kbdharun kbdharun left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Hi. Afaik, the main branch is no longer going to be used and instead dev branch will be tagged and released (which will automatically push to the main tag too).

Need confirmation from @taukakao on this.

@jardon
Copy link
Member Author

jardon commented Sep 4, 2024

That is likely correct. The release is tagged as dev, but we can wait to confirm.

@jardon
fix:[close Vanilla-OS#183] Restrict differ to dev branch only
2b756e1 
Add branches definition to differ workflow

Change container ref to match branch name
@jardon jardon force-pushed the fix/restrict-differ branch from cf64bc7 to 2b756e1 Compare September 4, 2024 12:16
@jardon jardon changed the title fix:[close #183] Restrict differ to main branch only fix:[close #183] Restrict differ to dev branch only Sep 4, 2024
@jardon
Copy link
Member Author

jardon commented Sep 4, 2024

I impatiently updated the PR. It now targets dev and no longer hard codes the tag

@kbdharun
Copy link
Member

kbdharun commented Sep 4, 2024

I impatiently updated the PR. It now targets dev and no longer hard codes the tag

Nice, however, the issue with the current implementation is stable users use the main tag which is pushed on a tag by this job:

desktop-image/.github/workflows/vib-build.yml

Lines 84 to 87 in 1cfa836

- name: Extra image tag release
if: ${{ github.ref_type == 'tag' }}
run: |
echo "EXTRA_TAG=raw,main" >> "$GITHUB_ENV"

So if differ is run and generates a changelog for specific tags, the end users might not get the changelog since it would be uploaded to the differ instance for the tag instead of the main one.

@jardon
Copy link
Member Author

jardon commented Sep 4, 2024 •
edited
Loading

i think im missing some info, but if i understand correctly:

  • differ workflow should run on the tag dev
  • it should pull the main image to run the script against

does that track?

Edit: oh I see my branch is behind

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kbdharun kbdharun kbdharun approved these changes

@mirkobrombin mirkobrombin mirkobrombin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

only run differ workflow for main branch
3 participants
@jardon @kbdharun @mirkobrombin