-
Notifications
You must be signed in to change notification settings - Fork 53
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
Don't build conda store cli #1019
base: main
Are you sure you want to change the base?
Changes from 7 commits
7b78ee3
da8eb29
0dbc04a
4276589
5b6ccfd
89a2bb5
821a6e3
d6a2f63
261bbcc
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
soapy1 marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There are a lot of places where we use There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think the amount of effort it will take to introduce a job-level variable will be pretty similar to the amount of effort it will take to explicitly rename things. Since (1) we should only be renaming But open to doing it if I'm missing an important upside that it will provide. I think it would be appropriate to do that work in a follow up PR |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,28 +20,23 @@ jobs: | |
build-package: | ||
name: "Build & verify package" | ||
runs-on: ubuntu-latest | ||
strategy: | ||
matrix: | ||
directory: | ||
- "conda-store" | ||
- "conda-store-server" | ||
defaults: | ||
run: | ||
working-directory: ${{ matrix.directory }} | ||
working-directory: conda-store-server | ||
steps: | ||
- name: "Checkout Repository 🛎" | ||
uses: actions/checkout@v4 | ||
with: | ||
fetch-depth: 0 | ||
|
||
- run: echo "Running on ${{ matrix.directory }}" | ||
- run: echo "Running on conda-store-server" | ||
soapy1 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
- name: "Build and check package - ${{ matrix.directory }} 📦" | ||
- name: "Build and check package - conda-store-server 📦" | ||
soapy1 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
uses: hynek/build-and-inspect-python-package@v2 | ||
id: baipp | ||
with: | ||
path: ${{ matrix.directory }} | ||
upload-name-suffix: "-${{ matrix.directory }}" | ||
path: conda-store-server | ||
upload-name-suffix: "-conda-store-server" | ||
attest-build-provenance-github: "true" | ||
|
||
- run: echo Packages can be found at ${{ steps.baipp.outputs.dist }} and in artifact ${{ steps.baipp.outputs.artifact-name }} | ||
|
@@ -55,17 +50,11 @@ jobs: | |
if: github.repository_owner == 'conda-incubator' && github.event_name == 'push' && github.ref == 'refs/heads/main' | ||
permissions: | ||
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing | ||
strategy: | ||
matrix: | ||
directory: | ||
- "conda-store" | ||
- "conda-store-server" | ||
|
||
steps: | ||
- name: "Download build artefacts 📥" | ||
uses: actions/[email protected] | ||
with: | ||
name: Packages-${{ matrix.directory }} | ||
name: Packages-conda-store-server | ||
path: dist | ||
|
||
- run: ls -lR dist/ | ||
|
@@ -86,20 +75,15 @@ jobs: | |
needs: build-package | ||
permissions: | ||
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing | ||
strategy: | ||
matrix: | ||
directory: | ||
- "conda-store" | ||
- "conda-store-server" | ||
defaults: | ||
run: | ||
working-directory: ${{ matrix.directory }} | ||
working-directory: conda-store-server | ||
|
||
steps: | ||
- name: "Download build artefacts 📥" | ||
uses: actions/[email protected] | ||
with: | ||
name: Packages-${{ matrix.directory }} | ||
name: Packages-conda-store-server | ||
path: dist | ||
|
||
- name: "Upload to PyPI 🚀" | ||
|
@@ -114,11 +98,6 @@ jobs: | |
needs: release-pypi | ||
permissions: | ||
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing | ||
strategy: | ||
matrix: | ||
docker-image: | ||
- conda-store | ||
- conda-store-server | ||
steps: | ||
- name: "Checkout Repository 🛎" | ||
uses: actions/checkout@v4 | ||
|
@@ -129,7 +108,7 @@ jobs: | |
|
||
- name: "Copy .dockerignore" | ||
run: | | ||
cp .dockerignore ${{ matrix.docker-image }}/.dockerignore | ||
cp .dockerignore conda-store-server/.dockerignore | ||
shell: bash | ||
|
||
- name: "Retrieve secret from Vault 🗝" | ||
|
@@ -166,8 +145,8 @@ jobs: | |
uses: docker/metadata-action@v5 | ||
with: | ||
images: | | ||
quansight/${{ matrix.docker-image }} | ||
quay.io/quansight/${{ matrix.docker-image }} | ||
quansight/conda-store-server | ||
quay.io/quansight/conda-store-server | ||
tags: | | ||
type=ref,event=tag | ||
type=ref,event=branch | ||
|
@@ -176,9 +155,9 @@ jobs: | |
- name: "Publish Docker image 🚀" | ||
uses: docker/build-push-action@v5 | ||
with: | ||
context: "${{ matrix.docker-image }}" | ||
context: "conda-store-server" | ||
target: "prod" | ||
file: "${{ matrix.docker-image }}/Dockerfile" | ||
file: "conda-store-server/Dockerfile" | ||
build-args: | | ||
RELEASE_VERSION=${{github.ref_name}} | ||
python_version=${{ env.PYTHON_VERSION_DEFAULT }} | ||
|
This file was deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we are not building the Docker image shall we also remove the Dockerfile?
There does not seem to be a reason to keep straggling files.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would say it would be better to remove all the conda-store directory at the same time opposed to piecemeal removing pieces.