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

feat(installer): add installer as a submodule #2110

Merged
merged 34 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
11b6cae
feat(installer): add installer as a submodule
maugde Aug 1, 2024
b01bb27
feat(installer): add installer as a submodule
maugde Aug 1, 2024
d17a8f3
Merge remote-tracking branch 'origin/feature/add-installer-submodule'…
maugde Aug 7, 2024
9b6f2d9
feat(installer): add installer as a submodule
maugde Aug 1, 2024
5fae646
ci(workflow): add installer build
maugde Aug 19, 2024
4813c0b
Merge remote-tracking branch 'origin/feature/add-installer-submodule'…
maugde Aug 19, 2024
41ef5c8
feat(installer): add installer as a submodule
maugde Aug 1, 2024
d59efea
ci(workflow): add installer build
maugde Aug 19, 2024
87970fe
ci(deploy): separate installer build from main project build
maugde Aug 22, 2024
b74c443
Merge remote-tracking branch 'origin/feature/add-installer-submodule'…
maugde Aug 22, 2024
208f2dc
ci(deploy): remove unecessary lines in `deploy.yml`
maugde Aug 22, 2024
8db3a45
ci(deploy): remove `installer/requirement.txt` installation in `deplo…
maugde Aug 22, 2024
4cb782c
ci(workflow): fix deploy workflow
maugde Aug 23, 2024
a75f7e0
build: use relative paths in coverage report (#2125)
sylvlecl Aug 21, 2024
24e5516
feat(ts-gen): add timeseries generation for thermal clusters (#2112)
MartinBelthle Aug 21, 2024
50025df
ci(workflow): add installer build
maugde Aug 19, 2024
6f987ac
Merge branch 'dev' into feature/add-installer-submodule
maugde Aug 23, 2024
85c265c
build: remove auto-generated changelog from desktop package (#2126)
sylvlecl Aug 23, 2024
24e8e8f
ci(deploy): separate installer build from main project build
maugde Aug 22, 2024
c7890fd
ci(workflow): fix deploy workflow
maugde Aug 23, 2024
2027624
ci(workflow): add installer build script and fix deploy workflow
maugde Aug 23, 2024
f61ef67
ci(workflow): remove duplicate workflow step
maugde Aug 23, 2024
4e2f8f9
Merge branch 'dev' into feature/add-installer-submodule
maugde Aug 26, 2024
8ab67b7
Merge branch 'dev' into feature/add-installer-submodule
maugde Aug 27, 2024
cc1d394
Merge branch 'dev' into feature/add-installer-submodule
maugde Aug 27, 2024
5f14724
Checkout submodules to build installer
sylvlecl Aug 28, 2024
dcd1109
Fix venv init on windows
sylvlecl Aug 28, 2024
eb77213
Update installer submodule (should fix requirements)
sylvlecl Aug 28, 2024
945effc
Update installer requirements
sylvlecl Aug 28, 2024
88e3d32
Try to use hatch as in installer repo
sylvlecl Aug 29, 2024
adbdd6a
Fix hatch script for windows
sylvlecl Aug 29, 2024
13b4e61
Add execution permissions for installer packaging script
sylvlecl Aug 29, 2024
c9d0faa
Remove workflow execution for current branch
sylvlecl Aug 29, 2024
880dc0a
Update installer submodule (requirements.txt removed)
sylvlecl Aug 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
branches:
- "master"
- "hotfix/**"
- "feature/add-installer-submodule"

jobs:
binary:
Expand Down Expand Up @@ -53,8 +54,17 @@ jobs:
if: matrix.os == 'windows-latest'
run: pip install -r requirements-windows.txt

- name: 📦 Packaging
run: bash ./package_antares_web.sh
- name: Initialize installer environment
run: |
python -m venv .installer
source .installer/bin/activate
maugde marked this conversation as resolved.
Show resolved Hide resolved
python -m pip install -r requirements.txt
working-directory: scripts

- name: Build installer
run: |
bash ./package_antares_installer.sh
maugde marked this conversation as resolved.
Show resolved Hide resolved
deactivate
working-directory: scripts

- name: 📜 Install changelog requirements
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "installer"]
path = installer
url = https://github.com/AntaresSimulatorTeam/antares-web-installer.git
1 change: 1 addition & 0 deletions installer
Submodule installer added at bd51be
22 changes: 22 additions & 0 deletions scripts/package_antares_installer.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/bash

# Antares Desktop Installer
#
# This script must be run by ̀.github/worflows/deploy.yml`.
# It builds the installer application and store it in the package directory.

SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P)
PROJECT_DIR=$(dirname -- "${SCRIPT_DIR}")
INSTALLER_DIR="${PROJECT_DIR}/installer/src/antares_web_installer/"
DIST_DIR="${PROJECT_DIR}/dist/package"

echo "INFO: Generating the Installer for the Desktop application..."
if [[ "$OSTYPE" == "msys"* ]]; then
pushd ${PROJECT_DIR}
pyinstaller --onefile "${INSTALLER_DIR}gui/__main__.py" --distpath "${DIST_DIR}" --hidden-import antares_web_installer.shortcuts._linux_shell --hidden-import antares_web_installer.shortcuts._win32_shell --noconsole --name AntaresWebInstaller
popd
else
pushd ${PROJECT_DIR}
pyinstaller --onefile "${INSTALLER_DIR}cli/__main__.py" --distpath "${DIST_DIR}" --hidden-import antares_web_installer.shortcuts._linux_shell --hidden-import antares_web_installer.shortcuts._win32_shell --noconsole --name AntaresWebInstallerCLI
popd
fi
Loading