Skip to content

Comments

Refactoring: Move NSIS files to libs\#2822

Merged
ann0see merged 1 commit intojamulussoftware:masterfrom
ann0see:move/moveNSIS
Sep 2, 2022
Merged

Refactoring: Move NSIS files to libs\#2822
ann0see merged 1 commit intojamulussoftware:masterfrom
ann0see:move/moveNSIS

Conversation

@ann0see
Copy link
Member

@ann0see ann0see commented Aug 29, 2022 •
edited
Loading

Short description of changes

Moves the NSIS files to the libs\ folder similar to ASIO-SDK. This is done to clean up the repo and simplify the structure. #2601 was the initial draft, and I plan multiple smaller PRs which are more testable.

CHANGELOG: Refactoring: Moved around files to clean up the repository
Context: Fixes an issue?

Related to: #2601

Does this change need documentation? What needs to be documented and how?

No.

Status of this Pull Request

Ready for testing and review.

What is missing until this pull request can be merged?
Testing. I'm a bit worried since the other PR I mentioned didn't fail, but there were some suspected issues.

Checklist

  • I've verified that this Pull Request follows the general code principles
  • I tested my code and it does what I want
  • My code follows the style guide
  • I waited some time after this Pull Request was opened and all GitHub checks completed without errors.
  • I've filled all the content above

pljones
pljones reviewed Aug 29, 2022
View reviewed changes
pljones
pljones reviewed Aug 29, 2022
View reviewed changes
@ann0see ann0see force-pushed the move/moveNSIS branch 3 times, most recently from befd311 to 43abc2e Compare August 29, 2022 19:47
@ann0see
Copy link
Member Author

ann0see commented Aug 29, 2022

I just read the following:

Building the projects in this solution one at a time. To enable parallel build, please add the "-m" switch.

Probably it's worth adding -m on the nsProcess build.

@ann0see
Copy link
Member Author

ann0see commented Aug 29, 2022

Ok. I successfully installed JACK and ASIO build on my Win 11 machine.

@hoffie
Copy link
Member

hoffie commented Aug 29, 2022

Does this need updating as well?

.github/workflows/autobuild.yml-314-          path: |
.github/workflows/autobuild.yml-315-            C:\Qt
.github/workflows/autobuild.yml-316-            C:\ChocoCache
.github/workflows/autobuild.yml:317:            ${{ github.workspace }}\windows\NSIS
.github/workflows/autobuild.yml-318-            ${{ github.workspace }}\libs\ASIOSDK2

We want to cache the downloaded NSIS source, but not (even if we seem to...?) anything coming from our repo or any build artifacts.

@ann0see
Copy link
Member Author

ann0see commented Aug 29, 2022

.github/workflows/autobuild.yml:317: ${{ github.workspace }}\windows\NSIS

needs updating. I don't think the other ones have changed?

@hoffie
Copy link
Member

hoffie commented Aug 29, 2022

I don't think the other ones have changed?

Sorry, I just added the other lines for context. NSIS is what I meant.

@ann0see ann0see requested a review from hoffie September 1, 2022 14:24
hoffie
hoffie approved these changes Sep 1, 2022
View reviewed changes
Copy link
Member

@hoffie hoffie left a comment

Choose a reason for hiding this comment

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

Looks good to me.

I've triggered two further CI runs and observed that NSIS source caching works properly:
https://github.com/jamulussoftware/jamulus/runs/8141543452?check_suite_focus=true#step:10:48

Using D:\a\jamulus\jamulus\windows..\libs\NSIS\NSIS-source from previous run (e.g. actions/cache)

@ann0see ann0see requested a review from pljones September 1, 2022 18:47
pljones
pljones reviewed Sep 1, 2022
View reviewed changes
@ann0see ann0see merged commit d17b80d into jamulussoftware:master Sep 2, 2022
@ann0see ann0see deleted the move/moveNSIS branch September 2, 2022 08:11
@pljones pljones added this to the Release 3.9.1 milestone Nov 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hoffie hoffie hoffie approved these changes

@pljones pljones pljones approved these changes

Assignees

No one assigned

Labels

None yet

Projects

Tracking
Status: Done

Milestone

Release 3.9.1

Development

Successfully merging this pull request may close these issues.

3 participants

@ann0see @hoffie @pljones