-
-
Notifications
You must be signed in to change notification settings - Fork 103
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
LibreCAD 3 CI/CD changes #394
Open
CRiSTiK24
wants to merge
95
commits into
LibreCAD:master
Choose a base branch
from
CRiSTiK24:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 85 commits
Commits
Show all changes
95 commits
Select commit
Hold shift + click to select a range
04c4ba5
Learning In Progress
CRiSTiK24 1310c04
Started Windows Workflow
CRiSTiK24 a39840c
Last thing to get windows build is finding a way to use cmake as in V…
CRiSTiK24 65c172d
Corrected Lua Path, added install comand in cmakeLists root folder
CRiSTiK24 184b549
See v0.0.1 patchnotes in release
CRiSTiK24 3356e8e
progress of the week. Removed extra files and made everything be in b…
CRiSTiK24 37edd83
updates in some files, the installer using external paths still fails
CRiSTiK24 e30d79e
003 version push
CRiSTiK24 da592de
Fixed small problems that I changed for the Windows installation that…
4e0fb19
More linux content towards the repo
56d794f
solved Desktop shortcut problem, VC redistributables and automatic in…
CRiSTiK24 dcd3b84
Changes for linux build
fb8a651
more fixes and scripts
CRiSTiK24 62f7e7a
I hope i don't overwrite any change. settings_PATH changes
CRiSTiK24 e2d217f
more tries, on windows doasn't work. Want to check on linux
CRiSTiK24 3a612e1
New changes, still not functional
9bafe59
checkpoint push
14b6fa2
Deadlock when building in windows
CRiSTiK24 6124396
Exe appended, cpp files modified for it
CRiSTiK24 648fdd4
cleaning of the changes
CRiSTiK24 07eceff
AppImage working :)
85cc563
Update and rename WindowsInstall.yml to main.yml
CRiSTiK24 cc020f4
identation
CRiSTiK24 c575a26
More indentation fix
CRiSTiK24 b37c052
small naming fix
CRiSTiK24 fa1236b
Update main.yml
CRiSTiK24 a295f5d
Update main.yml
CRiSTiK24 efd3e4b
Update main.yml
CRiSTiK24 7e7010f
A2
CRiSTiK24 cf92c93
Merge branch 'master' of https://github.com/CRiSTiK24/AddCI-CDLibreCAD_3
CRiSTiK24 76c1a2c
this compiles succesfully, but doasn't use new path
edb3ece
no crash, pushing to check it out with strace
CRiSTiK24 c75e5cd
linux appImage kinda works
6324fd3
Snap and AppImage functional on VM
8a567c3
Snap Script
83d04a5
Create main.yml
CRiSTiK24 6643698
moved path before creating painters
CRiSTiK24 38b66ed
Restructuration towars using scripts instead of raw code
CRiSTiK24 820c5bd
changed the way to call github variables
CRiSTiK24 9682263
error checkout corrected
CRiSTiK24 bec8529
Solved issues in the script
CRiSTiK24 4b3114d
Added necesary code that I deleted before
CRiSTiK24 a5a2198
copying a lib in linux + solving qt action problem
CRiSTiK24 fa1e3ed
More little changes
CRiSTiK24 26df18b
more little changes
CRiSTiK24 1ae9822
another try at win qt action
CRiSTiK24 3f97de1
modification to windows script 4 paths
CRiSTiK24 a540567
small fix on the Powershell set path
CRiSTiK24 dc49d15
Trying out if run does execute Powershell commands natively
CRiSTiK24 e37b5ce
error with YAML syntax
CRiSTiK24 828e280
moving command in a powershell script
CRiSTiK24 701e75c
I left a line with name by mistake, I remove it
CRiSTiK24 dcfc0ef
Modified build script to not us github actions variables as cmake arg…
CRiSTiK24 ad6b5dc
It needs the recursive checkout in windows too
CRiSTiK24 2042317
Also forgot that RelDebwithInfo is no longer created. Hopefully this …
CRiSTiK24 6ac83cc
The path to upload the artifact was wrong, changing it now
CRiSTiK24 e8e0b68
The path to upload the artifact was wrong, changing it now
CRiSTiK24 862b09e
path seems to need to be absolute
CRiSTiK24 fa27392
Windows build works! Patching paths to the linux one
CRiSTiK24 72e1531
It still can't find libdxfrw library, trying with another argument
CRiSTiK24 50d1e00
adding libdxfrw libs to path. Maybe this way it will find it
CRiSTiK24 dd7ddac
trying out again moving libdrfx.so.1 inside manually
CRiSTiK24 440b0f6
another try at getting the library dxfrw
CRiSTiK24 52a1937
The last try may have failed because the variable tha t stored the pa…
CRiSTiK24 bfa1a81
path to libdxfrw incorrect, writing one in another way
CRiSTiK24 c4a1375
libdxfrw solved! now qmake doasn't find qt, so exporting a variable t…
CRiSTiK24 a39c6b2
exporting the path is not enough, installing qt5-default seems to cre…
CRiSTiK24 97f3eba
default snapcraft versions seems to lack needed files. Removing it an…
CRiSTiK24 2e3c19c
using the --classic argument, maybe this way it works
CRiSTiK24 3594f2a
another try at reinstalling snapcraft from snapstore
CRiSTiK24 54e30cb
path towards libdx... in snapcraft yaml can't take relative paths ( l…
CRiSTiK24 2aa2653
changing name of the snap, so the artifact can be found and uploaded
CRiSTiK24 62989cb
Remembered why I didn't use LibreCAD3 as a name. It isn't allowed. Ch…
CRiSTiK24 5b1ca22
Trying 20.04 build
CRiSTiK24 ada2e8f
I guess this are the changes needed for ubunut 20.04
CRiSTiK24 30046e8
libglew is 2.1 in 20.04. Changing it at the snap
CRiSTiK24 470c49a
cmake is broken. Kitware workaround should not be needed anymore, so …
CRiSTiK24 89219b3
forgot that snapcraft.yaml had a reference to the version. Moving it …
CRiSTiK24 9867142
Also core20 uses a different way to pass cmake parameters
CRiSTiK24 6f83cbe
the snap needs an extra ld path to find the libdxfr
CRiSTiK24 9ec72c7
Cleaned all the comented code or uneficient paths
CRiSTiK24 9af2da8
Merge branch 'LibreCAD:master' into master
CRiSTiK24 28b6657
code factor corrections
CRiSTiK24 372fddb
Merge branch 'master' of https://github.com/CRiSTiK24/AddCI-CDLibreCAD_3
CRiSTiK24 b21fb20
Second round of codefactoring
CRiSTiK24 7999412
deleting unneded scripts. Changing the names of the ones still used. …
CRiSTiK24 dd70887
had a path to script wrong, trying again
CRiSTiK24 f78ea3b
Forgot to add a "/" in a path
CRiSTiK24 ae80500
Trying out LUACMDINTERFACE ON, to see if it builds now
CRiSTiK24 4fc29b2
Trying to run a debug run to solve windows issue
CRiSTiK24 9b3835a
libboost also needs to be installed in debug mode. Trying to set it f…
CRiSTiK24 c4011f0
Both installs must be debug
CRiSTiK24 281fa2e
some packages are missing for debug, trying to let connan build those
CRiSTiK24 a9398ed
Going back on the changes, adding conan to build missing packages
CRiSTiK24 2371210
I forgot about changing CPack back to RelWithDebInfo
CRiSTiK24 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
name: Librecad3 Builders | ||
'on': | ||
workflow_dispatch: null | ||
push: | ||
branches: | ||
- main | ||
jobs: | ||
linux: | ||
name: Building LibreCAD3 on ubuntu runner | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout | ||
uses: actions/[email protected] | ||
|
||
- run: cd ${{ github.workspace }} | ||
|
||
- run: git submodule init | ||
|
||
- run: git submodule update --recursive --remote | ||
|
||
- run: ${{ github.workspace }}/scripts/ubuntu-install/1.install.sh | ||
|
||
- run: cd ${{ github.workspace }} | ||
|
||
- run: sudo ${{ github.workspace }}/scripts/ubuntu-install/2.AppImage.sh | ||
|
||
- run: cd ${{ github.workspace }} | ||
|
||
- run: ${{ github.workspace }}/scripts/ubuntu-install/3.Snap.sh | ||
|
||
- name: Uploading AppImage | ||
uses: actions/[email protected] | ||
with: | ||
path: ${{ github.workspace }}/build/LibreCAD**AppImage | ||
name: LibreCAD3.AppImage | ||
- name: Uploading snap | ||
uses: actions/[email protected] | ||
with: | ||
path: ${{ github.workspace }}/librecad**snap | ||
name: LibreCAD3.snap | ||
windows: | ||
name: Building LibreCAD3 on windows runner | ||
runs-on: windows-latest | ||
steps: | ||
|
||
- name: Checkout | ||
uses: actions/[email protected] | ||
|
||
- name: Install Visual Studio 2019 with tools | ||
run: ${{ github.workspace }}/scripts/windows-install/1.2.installVisual2019.bat | ||
|
||
- run: cd ${{ github.workspace }} | ||
|
||
- run: git submodule init | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same remark here |
||
|
||
- run: git submodule update --recursive --remote | ||
|
||
- run: ${{ github.workspace }}/scripts/windows-install/2.installconan.bat | ||
|
||
- run: ${{ github.workspace }}/scripts/windows-install/2.2.createConanDirAndInstallDependencies.bat | ||
|
||
- run: cd ${{ github.workspace }}/.. | ||
|
||
- name: Install Qt5 | ||
uses: jurplel/install-qt-action@v2 | ||
with: | ||
version: 5.12.2 | ||
#arch: win64_msvc2019_64 | ||
#setup-python: 'false' | ||
|
||
- run: setx QTDIR "${{ env.Qt5_DIR }}\5.15.2\msvc2019_64" | ||
|
||
- run: setx QT_QPA_PLATFORM_PLUGIN_PATH "${{ env.Qt5_DIR }}\plugins\platforms\" | ||
|
||
- run: ${{ github.workspace }}/scripts/windows-install/3.1.PathVariables.ps1 | ||
|
||
- run: cd ${{ github.workspace }} | ||
|
||
- run: ${{ github.workspace }}/scripts/windows-install/4.buildLibrecadAndGetInstaller.bat | ||
|
||
- name: Uploading exe | ||
uses: actions/[email protected] | ||
with: | ||
path: '${{ github.workspace }}/out/build/windows-default/LibreCAD3**.exe' | ||
name: LibreCAD3.exe |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
[Desktop Entry] | ||
Version=1.0 | ||
Type=Application | ||
Name=LibreCAD | ||
GenericName=CAD system | ||
GenericName[da]=Computerhjulpet design (CAD) | ||
GenericName[de]=System für computerunterstützte Konstruktion | ||
GenericName[it]=Sistema CAD | ||
GenericName[ja]=コンピュータ支援設計 (CAD) システム | ||
GenericName[ru]=Система автоматизированного проектирования | ||
GenericName[sk]=CAD systém | ||
GenericName[uk]=Система автоматизованого проектування | ||
Comment=A professional CAD System | ||
Comment[es]=Un sistema CAD profesional | ||
Comment[ru]=Профессиональная CAD система | ||
Comment[sq]=Një sistem profesional CAD | ||
Comment[be]=Прафэсійная CAD-сыстэма | ||
Comment[ast]=Un sistema CAD profesional | ||
Comment[bn]=পেশাদারী CAD পদ্ধতি | ||
Comment[bs]=Profesionalni sistem CAD | ||
Comment[pt_BR]=Um sistema CAD profissional | ||
Comment[bg]=Професионална CAD система | ||
Comment[ca]=Un sistema CAD professional | ||
Comment[ca@valencia]=Un sistema CAD professional | ||
Comment[zh_HK]=專業 CAD 系統 | ||
Comment[da]=Et professionelt CAD-system | ||
Comment[cs]=Profesionální CAD systém | ||
Comment[crh]=Profesyonel CAD Sistemi | ||
Comment[zh_TW]=專業 CAD 系統 | ||
Comment[zh_CN]=一个专业的 CAD 系统 | ||
Comment[nl]=Een professioneel CAD-systeem | ||
Comment[fi]=Ammattimainen CAD-järjestelmä | ||
Comment[fr]=Un système de CAO professionnel | ||
Comment[gl]=Un sistema de CAD profesional | ||
Comment[de]=Ein professionelles CAD-System | ||
Comment[el]=Ένα επαγγελματικό σύστημα σχεδίασης CAD | ||
Comment[is]=Hágæða teiknikerfi (CAD) | ||
Comment[hu]=Professzionális CAD-rendszer | ||
Comment[it]=Un sistema CAD professionale | ||
Comment[ja]=プロフェッショナル CAD システム | ||
Comment[ky]=Кесиптик CAD - тутуму | ||
Comment[ms]=Sistem CAD profesional | ||
Comment[nb]=Et profesjonelt CAD-system | ||
Comment[pt]=Um sistema CAD profissional | ||
Comment[pl]=Profesjonalny system CAD | ||
Comment[oc]=Un sistèma de CAO professional | ||
Comment[ro]=Un sistem profesional CAD | ||
Comment[tg]=Системаи касбии CAD | ||
Comment[sv]=Professionellt CAD-system | ||
Comment[sl]=Profesionalni sistem CAD | ||
Comment[uk]=Професійна САПР | ||
Comment[tr]=Profesyonel CAD Sistemi | ||
TryExec=librecad | ||
Exec=librecad %F | ||
Icon=librecad | ||
Categories=Graphics;Engineering; | ||
MimeType=image/vnd.dxf; | ||
X-AppImage-Version=da592de | ||
|
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@CRiSTiK24 you can check the
submodule
option of thecheckout
action