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.

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

Close #827 Freeze docassemblecli version at 0.0.17 #841

Merged
merged 1 commit into from
Dec 21, 2023
Merged

Close #827 Freeze docassemblecli version at 0.0.17 #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ Format:
-
-->

<!-- ## [Unreleased] -->
## [Unreleased]

### Internal
- Freeze `docassemblecli` version at 0.0.17. See [#827](https://github.com/SuffolkLITLab/ALKiln/issues/827).

## [5.8.0] - 2023-12-18

Expand Down
7 changes: 6 additions & 1 deletion action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ inputs:
ALKILN_TAG_EXPRESSION:
description: "The tag expression to use to limit which tests to run. Default is no tag expression."
required: false
DOCASSEMBLECLI_VERSION:
description: 'Where to get the docassemblecli package. E.g. a GitHub zip or a pypi version.'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fairly certain this syntax pip install docassemblecli==$DOCASSEMBLCLI_VERSION will only work with specific pypi versions. You'd to wrap the whole thing in quotes for it to work with @ https://github.com/.../archive/main.zip. https://pip.pypa.io/en/stable/reference/requirement-specifiers/ should have the different things pip accepts.

To be clear, I think restricting to pypi versions of the package is fine, but I just think that should be reflected in the description

required: false
default: "0.0.17"

runs:
using: "composite"
Expand All @@ -52,6 +56,7 @@ runs:
echo "ALKILN_VERSION=${{ inputs.ALKILN_VERSION }}" >> $GITHUB_ENV
echo "MAX_SECONDS_FOR_SETUP=${{ inputs.MAX_SECONDS_FOR_SETUP }}" >> $GITHUB_ENV
echo "SERVER_RELOAD_TIMEOUT_SECONDS=${{ inputs.SERVER_RELOAD_TIMEOUT_SECONDS }}" >> $GITHUB_ENV
echo "DOCASSEMBLECLI_VERSION=${{ inputs.DOCASSEMBLECLI_VERSION }}" >> $GITHUB_ENV
echo "_ORIGIN=github" >> $GITHUB_ENV
shell: bash
- name: "ALKiln setup info: confirm environment variables"
Expand Down Expand Up @@ -82,7 +87,7 @@ runs:
if: ${{ inputs.INSTALL_METHOD == 'playground' }}
run: |
# ALKiln setup info: Create a Project and install the package from GitHub
pip3 install docassemblecli
pip install docassemblecli==$DOCASSEMBLECLI_VERSION
alkiln-setup
shell: bash
- name: "ALKiln setup ERROR"
Expand Down
9 changes: 7 additions & 2 deletions action_for_github_server/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ inputs:
description: "Default is 600 seconds. Maximum amount of seconds to give the docassemble docker container to serve the site."
required: false
default: 600 # 10 min
DOCASSEMBLECLI_VERSION:
description: 'Where to get the docassemblecli package. E.g. a GitHub zip or a pypi version.'
required: false
default: "0.0.17"

outputs:
DOCASSEMBLE_DEVELOPER_API_KEY:
Expand Down Expand Up @@ -50,6 +54,7 @@ runs:
echo "DA_ADMIN_EMAIL=admin@example.com" >> $GITHUB_ENV
# Login will fail if this is "password"
echo "DA_ADMIN_PASSWORD=@123abcdefg" >> $GITHUB_ENV
echo "DOCASSEMBLECLI_VERSION=${{ inputs.DOCASSEMBLECLI_VERSION }}" >> $GITHUB_ENV
shell: bash
- id: api_key_output_step
run: |
Expand Down Expand Up @@ -188,7 +193,7 @@ runs:
with:
python-version: '3.10'
# No output
- run: pip install docassemblecli > /dev/null 2>&1
- run: pip install docassemblecli==$DOCASSEMBLECLI_VERSION > /dev/null 2>&1
if: ${{ env.OUTPUT_DOCKER == 'false' }}
shell: bash
# Install the package, the current directory (.), onto the docassemble server
Expand All @@ -197,7 +202,7 @@ runs:
shell: bash

# With output
- run: pip install docassemblecli
- run: pip install docassemblecli==$DOCASSEMBLECLI_VERSION
if: ${{ env.OUTPUT_DOCKER == 'true' }}
shell: bash
# Install the package, the current directory (.), onto the docassemble server
Expand Down