diff --git a/.github/workflows/build_pkg.yml b/.github/workflows/build_pkg.yml deleted file mode 100644 index 2534a86..0000000 --- a/.github/workflows/build_pkg.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: Build packages but don't deploy - -on: - workflow_dispatch: - push: - branches: - - main - - developer - - #run on PRs as well? - -jobs: - build: - strategy: - fail-fast: false - matrix: - platform: [ubuntu-latest, ] # macos-12, windows-2019] - python-version: ["3.12",] - - runs-on: ${{ matrix.platform }} - - # The setup-miniconda action needs this to activate miniconda - defaults: - run: - shell: "bash -l {0}" - - steps: - - uses: actions/checkout@v4 - - - name: Get conda - uses: conda-incubator/setup-miniconda@v3.0.4 - with: - python-version: ${{ matrix.python-version }} - channels: conda-forge - - - name: Prepare - run: conda install conda-build conda-verify pytest anaconda-client - - - name: Build - env: - CONDA_TOKEN: ${{ secrets.CONDA_TOKEN }} - run: conda build conda-recipe - diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ba14770..81edde3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,7 +1,10 @@ -name: Deploy to slsdetectorgroup conda channel +name: Build pkgs and deploy if on main on: - workflow_dispatch + push: + branches: + - main + - developer jobs: build: @@ -28,9 +31,10 @@ jobs: channels: conda-forge - name: Prepare - run: conda install conda-build conda-verify pytest anaconda-client + run: conda install conda-build=24.9 conda-verify pytest anaconda-client - name: Enable upload + if: github.ref == 'refs/heads/main' run: conda config --set anaconda_upload yes - name: Build diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index ec1d0dd..ca5178e 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,6 +1,6 @@ package: name: aare - version: 2024.11.15.dev0 #TODO! how to not duplicate this? + version: 2024.11.26.dev0 #TODO! how to not duplicate this? source: diff --git a/pyproject.toml b/pyproject.toml index 00230f7..2a90f8a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build" [project] name = "aare" -version = "2024.11.15.dev0" +version = "2024.11.26.dev0" [tool.scikit-build]