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

Fix windows conda package upload and build ci #1792

Merged
merged 6 commits into from
Jun 4, 2024
Merged

Fix windows conda package upload and build ci #1792

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1fe6a22
windows OS is 2022 not 2019 on runner
eberrigan Jun 3, 2024
cf44276
upload windows conda build manually but not pypi build
eberrigan Jun 3, 2024
80f7c27
remove comment and run build ci
eberrigan Jun 3, 2024
a31fefa
change build manual back so that it doesn't upload
eberrigan Jun 3, 2024
8a0499b
remove branch from build manual
eberrigan Jun 3, 2024
58393f2
update installation docs for 1.4.1a1
eberrigan Jun 3, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ jobs:

# Login to conda (Windows)
- name: Login to Anaconda (Windows)
if: matrix.os == 'windows-2019'
if: matrix.os == 'windows-2022'
env:
ANACONDA_LOGIN: ${{ secrets.ANACONDA_LOGIN }}
shell: powershell
Expand All @@ -182,12 +182,12 @@ jobs:

# Upload conda package (Windows)
- name: Upload conda package (Windows/main)
if: matrix.os == 'windows-2019' && !github.event.release.prerelease
if: matrix.os == 'windows-2022' && !github.event.release.prerelease
shell: powershell
run: |
anaconda -v upload "build\win-64\*.tar.bz2"
- name: Upload conda package (Windows/dev)
if: matrix.os == 'windows-2019' && github.event.release.prerelease
if: matrix.os == 'windows-2022' && github.event.release.prerelease
shell: powershell
run: |
anaconda -v upload "build\win-64\*.tar.bz2" --label dev
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
environment-file: environment_build.yml
activate-environment: sleap_ci
conda-solver: "libmamba"
# use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!

- name: Print build environment info
shell: bash -l {0}
Expand Down
55 changes: 28 additions & 27 deletions .github/workflows/build_manual.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ on:
- '.github/workflows/build_manual.yml'
branches:
# - develop
- fakebranch
# - fakebranch
- elizabeth/Fix-windows-build-and-build-CI
Copy link

Choose a reason for hiding this comment

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

Branch name in the trigger paths seems to be specific to a user or feature branch.

Consider using more generic branch names or patterns (like feature/*) to avoid hardcoding specific user branches which might not be relevant in the future.


jobs:
build:
Expand Down Expand Up @@ -59,14 +60,14 @@ jobs:
run: |
python setup.py bdist_wheel

# Upload pip wheel (Ubuntu)
- name: Upload pip wheel (Ubuntu)
if: matrix.os == 'ubuntu-22.04'
env:
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
shell: bash -l {0}
run: |
twine upload -u __token__ -p "$PYPI_TOKEN" dist/* --non-interactive --skip-existing --disable-progress-bar
# # Upload pip wheel (Ubuntu)
# - name: Upload pip wheel (Ubuntu)
# if: matrix.os == 'ubuntu-22.04'
# env:
# PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
# shell: bash -l {0}
# run: |
# twine upload -u __token__ -p "$PYPI_TOKEN" dist/* --non-interactive --skip-existing --disable-progress-bar

# Build conda package (Ubuntu)
- name: Build conda package (Ubuntu)
Expand Down Expand Up @@ -169,14 +170,14 @@ jobs:
# run: |
# yes 2>/dev/null | anaconda login --username sleap --password "$ANACONDA_LOGIN" || true

# # Login to conda (Windows)
# - name: Login to Anaconda (Windows)
# if: matrix.os == 'windows-2022'
# env:
# ANACONDA_LOGIN: ${{ secrets.ANACONDA_LOGIN }}
# shell: powershell
# run: |
# echo "yes" | anaconda login --username sleap --password "$env:ANACONDA_LOGIN"
# Login to conda (Windows)
- name: Login to Anaconda (Windows)
if: matrix.os == 'windows-2022'
env:
ANACONDA_LOGIN: ${{ secrets.ANACONDA_LOGIN }}
shell: powershell
run: |
echo "yes" | anaconda login --username sleap --password "$env:ANACONDA_LOGIN"

# # Login to conda (Mac)
# - name: Login to Anaconda (Mac)
Expand All @@ -187,12 +188,12 @@ jobs:
# run: |
# yes 2>/dev/null | anaconda login --username sleap --password "$ANACONDA_LOGIN" || true

# # Upload conda package (Windows)
# - name: Upload conda package (Windows/dev)
# if: matrix.os == 'windows-2022'
# shell: powershell
# run: |
# anaconda -v upload "build\win-64\*.tar.bz2" --label dev
# Upload conda package (Windows)
- name: Upload conda package (Windows/dev)
if: matrix.os == 'windows-2022'
shell: powershell
run: |
anaconda -v upload "build\win-64\*.tar.bz2" --label dev

# # Upload conda package (Ubuntu)
# - name: Upload conda package (Ubuntu/dev)
Expand All @@ -208,7 +209,7 @@ jobs:
# run: |
# anaconda -v upload build/osx-arm64/*.tar.bz2 --label dev

# - name: Logout from Anaconda
# shell: bash -l {0}
# run: |
# anaconda logout
- name: Logout from Anaconda
shell: bash -l {0}
run: |
anaconda logout
Loading