Skip to content

Address feedback from 'Support local builds for all installers' PR #4706

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.

Sign up for GitHub

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

Merged
derekbekoe merged 3 commits into from
Oct 19, 2017
Merged

Address feedback from 'Support local builds for all installers' PR #4706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2e627f
Address feedback from 'Support local builds for all installers' PR
derekbekoe Oct 18, 2017
b586387
Suggest pwd as they'll be in that directory usually anyway
derekbekoe Oct 18, 2017
adba37c
Add note on Docker saving images
derekbekoe Oct 19, 2017
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
7 changes: 6 additions & 1 deletion build_scripts/debian/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ make install
# note: This installation step could happen in debian/rules but was unable to escape $ char.
# It does not affect the built .deb file though.
$source_dir/python_env/bin/pip3 install wheel
for d in $source_dir/src/azure-cli $source_dir/src/azure-cli-core $source_dir/src/azure-cli-nspkg $source_dir/src/azure-cli-command_modules-nspkg $source_dir/src/command_modules/azure-cli-*/; do cd $d; $source_dir/python_env/bin/python3 setup.py bdist_wheel -d $tmp_pkg_dir; cd -; done;
for d in $source_dir/src/azure-cli $source_dir/src/azure-cli-core $source_dir/src/azure-cli-nspkg \
$source_dir/src/azure-cli-command_modules-nspkg $source_dir/src/command_modules/azure-cli-*/;
do cd $d;
$source_dir/python_env/bin/python3 setup.py bdist_wheel -d $tmp_pkg_dir;
cd -;
done;
all_modules=`find $tmp_pkg_dir -name "*.whl"`
$source_dir/python_env/bin/pip3 install $all_modules
$source_dir/python_env/bin/pip3 install --force-reinstall --upgrade azure-nspkg azure-mgmt-nspkg
Expand Down
12 changes: 11 additions & 1 deletion build_scripts/docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,17 @@ Verification
Run the image.

```
$ sudo docker run -it azuresdk/azure-cli-python:${CLI_VERSION}
$ docker run -it azuresdk/azure-cli-python:${CLI_VERSION}
$ az
$ az --version
```

Save the image
```
docker save -o docker-azuresdk-azure-cli-python-VERSION.tar azuresdk/azure-cli-python:${CLI_VERSION}
```

Load the saved image
```
docker load -i docker-azuresdk-azure-cli-python-VERSION.tar
```
5 changes: 3 additions & 2 deletions build_scripts/rpm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ Build example:
Note: use the full path to the repo path, not a relative path.
```
git clone https://github.com/azure/azure-cli
cd azure-cli
export CLI_VERSION=2.0.16
export REPO_PATH=~/azure-cli
rpmbuild -v -bb --clean azure-cli/build_scripts/rpm/azure-cli.spec
export REPO_PATH=$(pwd)
rpmbuild -v -bb --clean build_scripts/rpm/azure-cli.spec
```

Verification
Expand Down
1 change: 0 additions & 1 deletion build_scripts/rpm/azure-cli.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ A great cloud needs great tools; we're excited to introduce Azure CLI 2.0,
%prep
# Create some tmp files
tmp_venv_archive=$(mktemp)
tmp_source_archive=$(mktemp)

# Download, Extract Virtualenv
wget %{venv_url} -qO $tmp_venv_archive
Expand Down
1 change: 0 additions & 1 deletion build_scripts/windows/scripts/build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ echo Built CLI packages successfully.

if %errorlevel% neq 0 goto ERROR


set ALL_MODULES=
for %%i in (%TEMP_SCRATCH_FOLDER%\*.whl) do (
set ALL_MODULES=!ALL_MODULES! %%i
Expand Down