Commit graph

43 commits

Author SHA1 Message Date
Pedro Algarvio
2a65c3e025 Pass along the relenv version that should be used.
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-06-16 07:32:35 +01:00
Pedro Algarvio
c10eb79954
Merge 3006.x into master
Conflicts:
* changelog/64226.fixed.md
* tests/pytests/unit/states/test_pip.py
2023-05-30 12:59:16 +01:00
MKLeb
ae9f9d379b Fix windows and mac building from without an existing onedir 2023-05-24 15:13:40 +01:00
MKLeb
e2a624f984 Build macos packages without existing onedir 2023-05-24 15:13:40 +01:00
MKLeb
c6c9b7fefc Build windows packages without an existing onedir in CICD 2023-05-24 15:13:40 +01:00
Pedro Algarvio
a81f58f37d Define a variable for the path to shared-gh-workflows-context.yml
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-05-22 19:53:17 -07:00
Pedro Algarvio
ad84d7cae9 Let's not concentrate the logic into a "one liner"
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-05-05 10:11:18 +01:00
Pedro Algarvio
f871c09e7b Fix typo
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-05-05 10:11:18 +01:00
Daniel A. Wozniak
2920f01161 Account for different extras location on win32 2023-05-05 10:11:18 +01:00
Pedro Algarvio
2aad5d20f1 Add build time checks to ensure the right relenv version is being used
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-05-05 10:11:18 +01:00
Pedro Algarvio
310991a6d6 The extras-<python-major>.<python-minor> is a Salt thing.
Create it at the right stage.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-05-05 10:11:18 +01:00
Pedro Algarvio
5c1ac329c4 Get site-packages from python
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-05-05 10:11:18 +01:00
Pedro Algarvio
42a3080b1d Only delete existing paths on macOS onedir
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-05-05 10:11:18 +01:00
Pedro Algarvio
3584921fc6 Add a .pth to the onedir env to ensure packages in extras are importable
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-05-05 10:11:18 +01:00
Pedro Algarvio
ddd87720ec Fix Windows package signing
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-04-14 15:46:15 -07:00
Twangboy
501ee0bc62 Add Pedro's patches 2023-04-14 15:46:15 -07:00
Daniel A. Wozniak
d65ae7d210 Copy environment and remove relenv debug 2023-04-14 16:57:58 +01:00
Daniel A. Wozniak
6c810e0da0 RELENV_DEBUG is causing pyo2 to fail 2023-04-14 16:57:58 +01:00
Daniel A. Wozniak
7858c2debf Test 2023-04-14 16:57:58 +01:00
Daniel A. Wozniak
79b3a56223 Set RELENV_BUILDENV in tools/pkg.py 2023-04-14 16:57:58 +01:00
Pedro Algarvio
74bdd39a77 Renamed cicd/shared-context.yml -> cicd/shared-gh-workflows-context.yml
It's now also used to detect changes to workflows.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-04-14 16:57:58 +01:00
MKLeb
9e4e9a0ca6 Create the extras directory with tools 2023-04-13 18:47:11 -07:00
Pedro Algarvio
2b27be3a99 Don't sudo when building macOS packages
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-04-13 09:35:03 +01:00
Pedro Algarvio
0e3935aecd Start signing macOS packages
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-04-13 09:35:03 +01:00
MKLeb
bd378232d4 Remove package name argument when building from source, we don't need it 2023-04-11 10:04:23 -07:00
MKLeb
230337b32e Change the spec and rules file to use tools, and build from source using tools for rpms and debs 2023-04-11 10:04:23 -07:00
MKLeb
77377f7aae Add building from source step to pipeline for debs and rpms 2023-04-11 10:04:23 -07:00
MKLeb
7106b1ba5b make the onedir build logic more generic, not expecting files under certain sub-paths 2023-04-11 10:04:23 -07:00
Pedro Algarvio
18babefe14 Get more information when installing packaging dependencies from source
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-03-22 15:08:20 +00:00
MKLeb
467740f4ab utilize tools.utils.REPO_ROOT 2023-03-21 14:44:51 +00:00
MKLeb
c7f08b61e5 remove the quotes from --no-binary 2023-03-21 14:44:51 +00:00
MKLeb
73c0104ad4 add --no-cache-dir to pip install requirements 2023-03-21 14:44:51 +00:00
MKLeb
aa3e2a08e6 We don't need to supply the patch argument anymore 2023-03-21 14:44:51 +00:00
MKLeb
1e319f84fc handle errors on removing paths on macos if they don't exist 2023-03-21 14:44:51 +00:00
MKLeb
9d80605623 Try resolving the salt archive name to resolve the macos issue 2023-03-21 14:44:51 +00:00
MKLeb
00e73da68a take in the path for the salt archive as a string 2023-03-21 14:44:51 +00:00
MKLeb
f917258322 windows uses amd64, not aarch64 2023-03-21 14:44:51 +00:00
MKLeb
9ba8bb6c44 install using pip as a module 2023-03-21 14:44:51 +00:00
MKLeb
3b662a5451 assert the requirements file exists when installing dependencies 2023-03-21 14:44:51 +00:00
MKLeb
82a6deb771 Set USE_STATIC_REQUIREMENTS and RELENV_PIP_DIR when building salt onedir with tools 2023-03-21 14:44:51 +00:00
MKLeb
4a669e9f52 Actually update build-onedir-deps/action.yml 2023-03-21 14:44:51 +00:00
MKLeb
36ca1926f6 Install salt into the onedir using tools 2023-03-21 14:44:51 +00:00
MKLeb
b9f8caa51e Move packaging commands to a subdirectory 2023-03-21 14:44:51 +00:00
Renamed from tools/pkgbuild.py (Browse further)