From 13563871cb44fe1c34119684bbfab2272a202d2c Mon Sep 17 00:00:00 2001 From: Sam Partee Date: Tue, 1 Oct 2024 23:48:51 -0700 Subject: [PATCH] Fix Poetry install order (#80) --- .github/workflows/release-containers.yml | 11 ++++++----- Makefile | 2 +- docker/Dockerfile | 6 +++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-containers.yml b/.github/workflows/release-containers.yml index 2efb0995..9fba3dad 100644 --- a/.github/workflows/release-containers.yml +++ b/.github/workflows/release-containers.yml @@ -9,9 +9,9 @@ on: workflow_dispatch: inputs: version: - description: 'Version to release (e.g., v1.0.0)' + description: 'Version to release (e.g., v0.1.0)' required: true - default: 'v1.0.0' + default: 'v0.0.1' env: REGISTRY: ghcr.io @@ -38,6 +38,9 @@ jobs: with: fetch-depth: 0 + - name: Install Poetry + uses: snok/install-poetry@v1 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -63,7 +66,7 @@ jobs: elif [[ $GITHUB_REF == refs/tags/* ]]; then echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV else - echo "VERSION=$(date +'%Y.%m.%d')-$(git rev-parse --short HEAD)" >> $GITHUB_ENV + echo "VERSION=$(date +'%Y.%m.%d').dev0" >> $GITHUB_ENV fi - name: Build and push Actor image @@ -79,8 +82,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.PAT }} run: gh workflow -R ArcadeAI/Team run Deploy -f actor-version=${{ env.VERSION }} - - name: Install Poetry - uses: snok/install-poetry@v1 - name: Build Dev Python Package if: github.event_name == 'push' diff --git a/Makefile b/Makefile index 8e1de8c4..2c7cc5e7 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,7 @@ full-dist: clean-dist ## Build all projects and copy wheels to ./dist fi; \ done - @echo "✅ All projects built and wheels copied to arcade/dist" + @echo "✅ All toolkits built and wheels copied to ./dist" .PHONY: clean-dist clean-dist: ## Clean all built distributions diff --git a/docker/Dockerfile b/docker/Dockerfile index e2ea1066..e5cd31e7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -27,7 +27,11 @@ RUN apt-get update && apt-get install -y \ WORKDIR /app/arcade # Copy the parent directory contents into the container -COPY ./dist . +COPY ../dist /app/arcade/ + +# List files for debugging purposes +RUN ls -lah /app/arcade/ + # Install the wheel with extras (not evals for now) RUN python -m pip install ./arcade_ai-${VERSION}-py3-none-any.whl