Skip to content

Commit 8aa9cdb

Browse files
committed
ci: Upload the Ubuntu packages
1 parent c5ed430 commit 8aa9cdb

File tree

3 files changed

+27
-6
lines changed

3 files changed

+27
-6
lines changed

.github/workflows/test-uploads.yml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ jobs:
88
name: Build ChimeraX
99
strategy:
1010
matrix:
11-
os: [ubuntu-20.04, ubuntu-22.04]
11+
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
1212
env:
1313
PYOPENGL_PLATFORM: egl
1414
runs-on: ${{ matrix.os }}
1515
steps:
1616
- uses: actions/checkout@v4
1717
- run: sudo apt-get update && sudo apt-get upgrade -y && ${PWD}/utils/set_up_ubuntu.sh
18-
- run: MAKEOPTS="-j$(nproc)" make -j$(nproc) build-minimal
18+
- run: MAKEOPTS="-j$(nproc)" make -j$(nproc) install
1919
- name: Run the legacy test suite
2020
run: make test
2121
- name: Install Pytest
@@ -30,6 +30,18 @@ jobs:
3030
run: USE_COVERAGE=1 make pytest-app
3131
- name: Report coverage
3232
run: make report-coverage
33+
- name: Make the package
34+
run: make -f Makefile.ubuntu github-techpreview-package
35+
- run: mv ${{ matrix.os }}/ucsf-chimerax-*.deb ./chimerax.deb
36+
- name: Upload ChimeraX
37+
uses: ./utils/ci/upload_artifact
38+
with:
39+
artifact_path: chimerax.deb
40+
full_build: true
41+
release_type: github-techpreview
42+
platform: ${{ matrix.os }}
43+
deploy_key: ${{ secrets.PREBUILT_CACHE_SECRET }}
44+
3345
build-rocky8-docker:
3446
runs-on: ubuntu-20.04
3547
container:
@@ -45,7 +57,7 @@ jobs:
4557
# buildinfo.py breaks without this
4658
- run: chown -R $(id -u):$(id -g) $PWD
4759
- run: ${PWD}/utils/set_up_centos.sh
48-
- run: source /opt/rh/gcc-toolset-10/enable && MAKEOPTS="-j$(nproc)" make -j$(nproc) -f Makefile.centos build-minimal
60+
- run: source /opt/rh/gcc-toolset-10/enable && MAKEOPTS="-j$(nproc)" make -j$(nproc) -f Makefile.centos install
4961
- name: Run the legacy test suite
5062
run: make test
5163
- name: Install Pytest
@@ -60,6 +72,7 @@ jobs:
6072
run: USE_COVERAGE=1 make pytest-app
6173
- name: Report coverage
6274
run: make report-coverage
75+
6376
build-macos:
6477
runs-on: macos-latest
6578
steps:
@@ -68,7 +81,7 @@ jobs:
6881
uses: Homebrew/actions/setup-homebrew@master
6982
- uses: actions/checkout@v4
7083
- run: ${PWD}/utils/set_up_macos.sh
71-
- run: MAKEOPTS="-j$(sysctl -n hw.logicalcpu)" make -j$(sysctl -n hw.logicalcpu) build-minimal
84+
- run: MAKEOPTS="-j$(sysctl -n hw.logicalcpu)" make -j$(sysctl -n hw.logicalcpu) install
7285
- name: Run the legacy test suite
7386
run: make test
7487
- name: Install Pytest
@@ -115,7 +128,7 @@ jobs:
115128
msystem: MINGW64
116129
update: true
117130
install: git mingw-w64-x86_64-imagemagick mingw-w64-x86_64-binutils mingw-w64-x86_64-gcc mingw-w64-x86_64-gcc-objc mingw-w64-x86_64-gcc-fortran rsync patch unzip openssh make mingw-w64-x86_64-autotools
118-
- run: AUTOMATIC_DISCOVERY=1 . ./vsvars.sh && MAKEOPTS="-j$(nproc)" make -j$(nproc) build-minimal
131+
- run: AUTOMATIC_DISCOVERY=1 . ./vsvars.sh && MAKEOPTS="-j$(nproc)" make -j$(nproc) install
119132
- name: Run the legacy test suite
120133
run: AUTOMATIC_DISCOVERY=1 . ./vsvars.sh && make test
121134
- name: Install Pytest

Makefile.ubuntu

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ daily-package: ubuntu
2929
techpreview-package: ubuntu
3030
$(APP_PYTHON_EXE) mkubuntu.py $(UBUNTU) techpreview
3131

32+
github-techpreview-package: ubuntu
33+
$(APP_PYTHON_EXE) mkubuntu.py $(UBUNTU) github-techpreview
34+
3235
candidate-package: ubuntu
3336
$(APP_PYTHON_EXE) mkubuntu.py $(UBUNTU) candidate
3437

mkubuntu.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ def main():
369369
error = True
370370
if len(sys.argv) >= 3:
371371
build = sys.argv[2]
372-
if build not in ['release', 'candidate', 'daily', 'techpreview']:
372+
if build not in ['release', 'candidate', 'daily', 'github-techpreview', 'techpreview']:
373373
error = True
374374
if error or len(sys.argv) > 3 or os_version not in UBUNTU_DEPENDENCIES:
375375
print(f'Usage: {sys.argv[0]} ubuntu-version [build-type]', file=sys.stderr)
@@ -401,6 +401,11 @@ def main():
401401
version = version_date
402402
pkg_name += "-techpreview"
403403
bin_name += "-techpreview"
404+
elif build == 'github-techpreview':
405+
# like daily build, version is date
406+
version = version_date
407+
pkg_name += "-github-techpreview"
408+
bin_name += "-github-techpreview"
404409
elif build == 'release':
405410
# release build
406411
version = version.base_version

0 commit comments

Comments
 (0)