Skip to content

Commit

Permalink
github-actions: try moving files directly
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinBubel committed Jan 14, 2024
1 parent 2100514 commit 3dd2e77
Showing 1 changed file with 10 additions and 22 deletions.
32 changes: 10 additions & 22 deletions .github/workflows/test-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,6 @@ jobs:
name: dist-artifacts-${{ matrix.os }}-${{ matrix.python }}
path: dist

# Output the artifact name for later use
- name: Set output
id: set_output
run: echo "dist-artifacts-${{ matrix.os }}-${{ matrix.python }}" >> $GITHUB_ENV

build-macos:
strategy:
matrix:
Expand Down Expand Up @@ -166,11 +161,6 @@ jobs:
name: dist-artifacts-${{ matrix.os }}-${{ matrix.python }}
path: dist/*

# Output the artifact name for later use
- name: Set output
id: set_output
run: printf "dist-artifacts-${{ matrix.os }}-${{ matrix.python }}" >> $GITHUB_ENV

build-linux:
strategy:
matrix:
Expand Down Expand Up @@ -220,11 +210,6 @@ jobs:
name: dist-artifacts-manylinux-${{ matrix.python }}
path: dist/*

# Output the artifact name for later use
- name: Set output
id: set_output
run: printf "dist-artifacts-manylinux-${{ matrix.python }}" >> $GITHUB_ENV

deploy:
runs-on: ubuntu-latest
needs: [test-windows, test-linux, test-macos, build-linux, build-windows, build-macos]
Expand All @@ -247,14 +232,17 @@ jobs:
with:
path: dist

- name: Get artifact names
run: |
# Read the artifact_name output from the build job
ARTIFACT_NAME=$(grep 'artifact_name=' $GITHUB_ENV | cut -d= -f2)
- name: Create dist directory
run: mkdir -p dist

# Download artifacts without additional subdirectories
mkdir -p dist
mv dist/$ARTIFACT_NAME/* dist/
- name: Move files from subdirectories
run: |
for subdirectory in dist/*/; do
dir_name=$(basename "$subdirectory")
mv "$subdirectory"* dist/
rm -r "$subdirectory"
echo "Moved files from '$dir_name' to 'dist/'"
done
- name: Inspect wheel files
run: |
Expand Down

0 comments on commit 3dd2e77

Please sign in to comment.