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

ci: also check for uncompiled SCSS styles #46275

Merged
merged 1 commit into from
Jul 3, 2024
Merged

Conversation

susnux
Copy link
Contributor

@susnux susnux commented Jul 3, 2024

Also check that changes of scss files are compiled to css in PRs.

@susnux susnux added bug 3. to review Waiting for reviews CI labels Jul 3, 2024
@susnux susnux added this to the Nextcloud 30 milestone Jul 3, 2024
@susnux susnux self-assigned this Jul 3, 2024
@susnux susnux enabled auto-merge July 3, 2024 09:34
@nickvergessen
Copy link
Member

/backport 995aa67 to stable29

@nickvergessen
Copy link
Member

/backport 995aa67 to stable28

@nickvergessen
Copy link
Member

Binary files a/core/css/server.css and b/core/css/server.css differ

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux
Copy link
Contributor Author

susnux commented Jul 3, 2024

Binary files a/core/css/server.css and b/core/css/server.css differ

Yes someone merge something in the meantime. Rebased, should work now.

@susnux susnux added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jul 3, 2024
@susnux susnux merged commit 599b86a into master Jul 3, 2024
167 checks passed
@susnux susnux deleted the check-uncompiled-styles branch July 3, 2024 15:58
Copy link

backportbot bot commented Jul 3, 2024

The backport to stable28 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable28
git pull origin stable28

# Create the new backport branch
git checkout -b backport/46275/stable28

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 995aa67f

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/46275/stable28

Error: Failed to cherry pick commits: error: no cherry-pick or revert in progress
fatal: cherry-pick failed


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Copy link

backportbot bot commented Jul 3, 2024

The backport to stable29 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable29
git pull origin stable29

# Create the new backport branch
git checkout -b backport/46275/stable29

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 995aa67f

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/46275/stable29

Error: Failed to cherry pick commits: error: no cherry-pick or revert in progress
fatal: cherry-pick failed


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@susnux
Copy link
Contributor Author

susnux commented Jul 3, 2024

/backport to stable29

@susnux
Copy link
Contributor Author

susnux commented Jul 3, 2024

/backport to stable28

Copy link

backportbot bot commented Jul 3, 2024

The backport to stable29 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable29
git pull origin stable29

# Create the new backport branch
git checkout -b backport/46275/stable29

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 98c143ec

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/46275/stable29

Error: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Copy link

backportbot bot commented Jul 3, 2024

The backport to stable28 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable28
git pull origin stable28

# Create the new backport branch
git checkout -b backport/46275/stable28

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 98c143ec

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/46275/stable28

Error: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@blizzz blizzz mentioned this pull request Jul 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish backport-request bug CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants