Adjust for FreeCAD v1 release

[jaecktec]

---

• I have read the contributing guideline and understand that I have made the correct modifications

---

Description:

Adjusted Dockerfile according to suggestions to support Freecad 1.0 with AppImage

Benefits of this PR and context:

Freecad 1.0

How Has This Been Tested?

I've build this on an M2 Macbook + X86 Linux machine and ran them

Source / References:

#4

[github-actions]

Thanks for opening this pull request! Be sure to follow the pull request template!

[LinuxServer-CI]

I am a bot, here are the test results for this PR:
https://ci-tests.linuxserver.io/lspipepr/freecad/0.20.2-pkg-294e4617-dev-8a297560bc4c93bd93d9466ed286a4ac7347922c-pr-6/index.html
https://ci-tests.linuxserver.io/lspipepr/freecad/0.20.2-pkg-294e4617-dev-8a297560bc4c93bd93d9466ed286a4ac7347922c-pr-6/shellcheck-result.xml

Tag	Passed
amd64-0.20.2-pkg-294e4617-dev-8a297560bc4c93bd93d9466ed286a4ac7347922c-pr-6	✅
arm64v8-0.20.2-pkg-294e4617-dev-8a297560bc4c93bd93d9466ed286a4ac7347922c-pr-6	✅

[LinuxServer-CI]

I am a bot, here are the test results for this PR:
https://ci-tests.linuxserver.io/lspipepr/freecad/0.20.2-pkg-294e4617-dev-e4c72d1ab9cbf8d0e183d5f3b593d8c5c1028536-pr-6/index.html
https://ci-tests.linuxserver.io/lspipepr/freecad/0.20.2-pkg-294e4617-dev-e4c72d1ab9cbf8d0e183d5f3b593d8c5c1028536-pr-6/shellcheck-result.xml

Tag	Passed
amd64-0.20.2-pkg-294e4617-dev-e4c72d1ab9cbf8d0e183d5f3b593d8c5c1028536-pr-6	✅
arm64v8-0.20.2-pkg-294e4617-dev-e4c72d1ab9cbf8d0e183d5f3b593d8c5c1028536-pr-6	✅

[LinuxServer-CI]

I am a bot, here are the test results for this PR:
https://ci-tests.linuxserver.io/lspipepr/freecad/0.20.2-pkg-294e4617-dev-724167f123d2d2131a06d829c387ddc64b30eacd-pr-6/index.html
https://ci-tests.linuxserver.io/lspipepr/freecad/0.20.2-pkg-294e4617-dev-724167f123d2d2131a06d829c387ddc64b30eacd-pr-6/shellcheck-result.xml

Tag	Passed
amd64-0.20.2-pkg-294e4617-dev-724167f123d2d2131a06d829c387ddc64b30eacd-pr-6	✅
arm64v8-0.20.2-pkg-294e4617-dev-724167f123d2d2131a06d829c387ddc64b30eacd-pr-6	✅

[LinuxServer-CI]

I am a bot, here are the test results for this PR:
https://ci-tests.linuxserver.io/lspipepr/freecad/0.20.2-pkg-447045da-dev-8aa08eeaaf46460b0e7379f26be62a904318bd77-pr-6/index.html
https://ci-tests.linuxserver.io/lspipepr/freecad/0.20.2-pkg-447045da-dev-8aa08eeaaf46460b0e7379f26be62a904318bd77-pr-6/shellcheck-result.xml

Tag	Passed
amd64-0.20.2-pkg-447045da-dev-8aa08eeaaf46460b0e7379f26be62a904318bd77-pr-6	✅
arm64v8-0.20.2-pkg-447045da-dev-8aa08eeaaf46460b0e7379f26be62a904318bd77-pr-6	✅

[LinuxServer-CI]

I am a bot, here are the test results for this PR:
https://ci-tests.linuxserver.io/lspipepr/freecad/0.20.2-pkg-d3ceb5ed-dev-6b6dea80990329390f243fb52c32d295447e2cf7-pr-6/index.html
https://ci-tests.linuxserver.io/lspipepr/freecad/0.20.2-pkg-d3ceb5ed-dev-6b6dea80990329390f243fb52c32d295447e2cf7-pr-6/shellcheck-result.xml

Tag	Passed
amd64-0.20.2-pkg-d3ceb5ed-dev-6b6dea80990329390f243fb52c32d295447e2cf7-pr-6	✅
arm64v8-0.20.2-pkg-d3ceb5ed-dev-6b6dea80990329390f243fb52c32d295447e2cf7-pr-6	✅

[tinuva]

Can confirm, building these changes works for me on x86-64 architecture.

[Roxedus]

Changing the location we ingest a application from does also need a chance in jenkins-vars, as well as a changelog entry.

[Roxedus]

We are not going to accept a hard coded version number.

[jaecktec]

replaced with environment variable

[tinuva]

Question, maybe suggestion, but would using the "continous" version be accepted?

Instead of using:

https://github.com/FreeCAD/FreeCAD/releases/download/1.0.0/FreeCAD_1.0.0-conda-Linux-x86_64-py311.AppImage

Use:

FREECAD_VERSION=$(curl -sX GET "https://api.github.com/repos/FreeCAD/FreeCAD/releases/latest" | awk '/tag_name/{print $4;exit}' FS='[""]'); 

curl -o /tmp/freecad.app -L "https://github.com/FreeCAD/FreeCAD/releases/download/${FREECAD_VERSION}/FreeCAD_$(echo ${FREECAD_VERSION} | sed 's/\b\(.\)/\u\1/g')-conda-Linux-x86_64-py311.AppImage" 

Though perhaps, the cleanest way is to use jq if available during docker image creation:

FREECAD_URL=$(curl -sX GET "https://api.github.com/repos/FreeCAD/FreeCAD/releases/latest" | jq '.assets[] | select(.name | contains("Linux") and contains("x86_64")) | select(.name | contains("SHA256") | not) | .browser_download_url');

curl -o /tmp/freecad.app -L FREECAD_URL

[LinuxServer-CI]

I am a bot, here are the test results for this PR:
https://ci-tests.linuxserver.io/lspipepr/freecad/0.20.2-pkg-f8b6d483-dev-3f998633f17a1048d6fce528cfee59d6327e87c2-pr-6/index.html
https://ci-tests.linuxserver.io/lspipepr/freecad/0.20.2-pkg-f8b6d483-dev-3f998633f17a1048d6fce528cfee59d6327e87c2-pr-6/shellcheck-result.xml

Tag	Passed
amd64-0.20.2-pkg-f8b6d483-dev-3f998633f17a1048d6fce528cfee59d6327e87c2-pr-6	✅
arm64v8-0.20.2-pkg-f8b6d483-dev-3f998633f17a1048d6fce528cfee59d6327e87c2-pr-6	✅

[AceDenghar]

Hi,

Thanks for your efforts.

Any chance to be available in the official docker image ?

Still stucked in 0.20, and I have some projects started in 1.0...

Thanks for all

Ps : sorry for my English

[jaecktec]

Though perhaps, the cleanest way is to use jq if available during docker image creation:

While in genereal I like the idea, I'd prefer to have a idemporent behaviour.
Something like this would probably be better off on the pipeline side of things :)

[jaecktec]

Where do I adjust the environment variable in Jenkins?

[Roxedus]

you dont

[stefgia]

The merge build is failing because FREECAD_VERSION is set as "0.20.2" and there is no app image at the corresponding gitub address https://github.com/FreeCAD/FreeCAD/releases/download/${FREECAD_VERSION}/FreeCAD_${FREECAD_VERSION}-conda-Linux-x86_64-py311.AppImage

I looked around the repository to see where this env var is set, but I couldn't find anything, except usages of it, which I guess means that the version is set through jenkins somehow and not through the files. So I guess unless the version env var is bumped this can't work.

Also since we will now be using the appimage, maybe we should delete the following packages from the package-versions.txt ?

freecad, 0.20.2+dfsg1-4, deb freecad-common, 0.20.2+dfsg1-4, deb freecad-python3, 0.20.2+dfsg1-4, deb

[thespad]

There isn't anything you can do as a 3rd party to get Jenkins to build using your version logic, because we specifically prevent it for security reasons.

This https://github.com/linuxserver/docker-freecad/blob/master/jenkins-vars.yml#L5-L6 needs changing, probably to something like https://github.com/linuxserver/docker-webcord/blob/master/jenkins-vars.yml#L5-L13 as this uses the GH release and the Dockerfiles themselves need something like https://github.com/linuxserver/docker-webcord/blob/master/Dockerfile#L19-L23 to fetch the latest version for scenarios where it's not passed into the build process.

Finally the readme-vars will need a new changelog entry to document the change of install process.

package_versions.txt is an output not an input so does not need to be touched.

[tinuva]

The merge build is failing because FREECAD_VERSION is set as "0.20.2" and there is no app image at the corresponding gitub address https://github.com/FreeCAD/FreeCAD/releases/download/${FREECAD_VERSION}/FreeCAD_${FREECAD_VERSION}-conda-Linux-x86_64-py311.AppImage

I looked around the repository to see where this env var is set, but I couldn't find anything, except usages of it, which I guess means that the version is set through jenkins somehow and not through the files. So I guess unless the version env var is bumped this can't work.

Also since we will now be using the appimage, maybe we should delete the following packages from the package-versions.txt ?

freecad, 0.20.2+dfsg1-4, deb freecad-common, 0.20.2+dfsg1-4, deb freecad-python3, 0.20.2+dfsg1-4, deb

If you look at pr #7 then you will see. That was my attempt at a better approach to switch yogithub.

Jenkins currently uses a apt command to see existing version available in the repository of the Linux distribution.

I that pr I attempted to switch jenkins to use a github api lookup to get the latest version.

I asked on discourse why the jenkins build fail for my pr. @Roxedus

[tinuva]

The merge build is failing because FREECAD_VERSION is set as "0.20.2" and there is no app image at the corresponding gitub address https://github.com/FreeCAD/FreeCAD/releases/download/${FREECAD_VERSION}/FreeCAD_${FREECAD_VERSION}-conda-Linux-x86_64-py311.AppImage

I looked around the repository to see where this env var is set, but I couldn't find anything, except usages of it, which I guess means that the version is set through jenkins somehow and not through the files. So I guess unless the version env var is bumped this can't work.

Also since we will now be using the appimage, maybe we should delete the following packages from the package-versions.txt ?

freecad, 0.20.2+dfsg1-4, deb freecad-common, 0.20.2+dfsg1-4, deb freecad-python3, 0.20.2+dfsg1-4, deb

Have a look at pr #7 which is my attemot to switch to github releases.

Currently jenkins is configured to look up latest version from the apt repo.

I tried to switch to the github api for relates version lookup, but jenkins still run the old config files from the existing repo before the pr, even for pr builds. This is what @Roxedus explained to me discourse.

I am however in hospital so can't take up that conversation further.

But somehow, a pr will have to be accepted to get an updated jenkins config into the main branch.