Release 0.2.0

.github/workflows/build-upload-conda-base.yml

@@ -6,36 +6,10 @@ on:
       label:
         required: true
         type: string
-      commit:
-        required: true
-        type: string
       env:
         required: true
         type: string
 
-# Rembember: you have to escape characters like $ with \$.
-env:
-  SETUP_BASE: |
-    apt-get -qq update > /dev/null;
-    apt-get -qq upgrade > /dev/null;
-    apt-get -qq install wget git > /dev/null;
-    useradd -ms /bin/bash pyompuser;
-    su pyompuser;
-    cd /home/pyompuser;
-  SETUP_MINICONDA: |
-    wget -q https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-\$(uname -m).sh -O miniconda.sh;
-    bash miniconda.sh -b -u -p ./miniconda3;
-    rm -rf miniconda.sh;
-    export PATH=/home/pyompuser/miniconda3/bin:\${PATH};
-    conda remove --name base conda-anaconda-telemetry
-    conda install -q -y -c conda-forge conda-build conda-verify anaconda-client;
-    conda config --set anaconda_upload yes;
-  SETUP_REPO: |
-    git clone https://github.com/Python-for-HPC/PyOMP;
-    cd PyOMP;
-    git checkout ${{ inputs.commit }};
-    export GITHUB_HEAD_SHA=${{ inputs.commit }};
-
 jobs:
   # Job to deploy llvm-openmp-dev, runs once as it is independent of the python
   # version.
@@ -44,13 +18,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        #os: [ubuntu-latest, macOS-latest, windows-latest]
-        os: [ubuntu-latest, macOS-latest]
+        # TODO: Add windows.
+        os: [ubuntu-latest, macOS-latest, ubuntu-24.04-arm]
     steps:
       - uses: actions/checkout@v4
-      - name: Set env for HEAD SHA
-        run:
-          echo "GITHUB_HEAD_SHA=${{ inputs.commit }}" >> $GITHUB_ENV
       - name: Create and activate conda env
         uses: conda-incubator/setup-miniconda@v3
         with:
@@ -69,87 +40,22 @@ jobs:
             --token ${{ secrets.ANACONDA_TOKEN }} \
             buildscripts/conda-recipes/llvm-openmp-dev;
 
-  # Job to deploy llvmlite and numba, matrixed on os and python version.
-  conda-deploy-llvmlite:
+  # Job to deploy the pyomp metapackage matrixed on the python version.
+  conda-deploy-pyomp:
     needs: conda-deploy-llvm-openmp-dev
-    name: llvmlite ${{ matrix.os }} ${{ matrix.python-version }}
+    name: pyomp ${{ matrix.os }} ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        #os: [ubuntu-latest, macOS-latest, windows-latest]
-        os: [ubuntu-latest, macOS-latest]
+        # TODO: Add windows.
+        os: [ubuntu-latest, macOS-latest, ubuntu-24.04-arm]
         python-version: ["3.8", "3.9", "3.10"]
     steps:
       - uses: actions/checkout@v4
-      - name: Set env for HEAD SHA
-        run:
-          echo "GITHUB_HEAD_SHA=${{ inputs.commit }}" >> $GITHUB_ENV
-      - name: Create and activate conda env
-        uses: conda-incubator/setup-miniconda@v3
+        # Checkout the repo with history to get the commit hash for the build
+        # string.
         with:
-          python-version: ${{ matrix.python-version }}
-          environment-file: ${{ inputs.env }}
-          auto-update-conda: false
-          auto-activate-base: false
-          show-channel-urls: true
-      - name: Build and upload llvmlite
-        run: |
-          conda remove --name base conda-anaconda-telemetry
-          conda install -q -y -c conda-forge conda-build conda-verify anaconda-client;
-          conda config --set anaconda_upload yes;
-          conda build --user python-for-hpc --label ${{ inputs.label }} \
-            -c python-for-hpc -c conda-forge \
-            --python ${{ matrix.python-version }} --token ${{ secrets.ANACONDA_TOKEN }} \
-            buildscripts/conda-recipes/llvmlite;
-
-  # Job to deploy numba, matrixed on os and python version.
-  conda-deploy-numba:
-    needs: conda-deploy-llvmlite
-    name: numba ${{ matrix.os }} ${{ matrix.python-version }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        #os: [ubuntu-latest, macOS-latest, windows-latest]
-        os: [ubuntu-latest, macOS-latest]
-        python-version: ["3.8", "3.9", "3.10"]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set env for HEAD SHA
-        run:
-          echo "GITHUB_HEAD_SHA=${{ inputs.commit }}" >> $GITHUB_ENV
-      - name: Create and activate conda env
-        uses: conda-incubator/setup-miniconda@v3
-        with:
-          python-version: ${{ matrix.python-version }}
-          environment-file: ${{ inputs.env }}
-          auto-update-conda: false
-          auto-activate-base: false
-          show-channel-urls: true
-      - name: Build and upload numba
-        run: |
-          conda remove --name base conda-anaconda-telemetry
-          conda install -q -y -c conda-forge conda-build conda-verify anaconda-client;
-          conda config --set anaconda_upload yes;
-          conda build --user python-for-hpc --label ${{ inputs.label }} \
-            -c python-for-hpc -c conda-forge \
-            --python ${{ matrix.python-version }} --token ${{ secrets.ANACONDA_TOKEN }} \
-            buildscripts/conda-recipes/numba;
-
-  # Job to deploy the pyomp metapackage, runs once as it is independent of the
-  # python version.
-  conda-deploy-pyomp:
-    needs: conda-deploy-numba
-    name: pyomp ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        #os: [ubuntu-latest, macOS-latest, windows-latest]
-        os: [ubuntu-latest, macOS-latest]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set env for HEAD SHA
-        run:
-          echo "GITHUB_HEAD_SHA=${{ inputs.commit }}" >> $GITHUB_ENV
+          fetch-depth: 0
       - name: Create and activate conda env
         uses: conda-incubator/setup-miniconda@v3
         with:
@@ -165,97 +71,6 @@ jobs:
           conda config --set anaconda_upload yes;
           conda build --user python-for-hpc --label ${{ inputs.label }} \
             -c python-for-hpc -c conda-forge \
+            --python ${{ matrix.python-version }} \
             --token ${{ secrets.ANACONDA_TOKEN }} \
             buildscripts/conda-recipes/pyomp;
-
-  ################################################################
-  # Deploy on ARM64 using QEMU and a docker container for building.
-  ################################################################
-  conda-deploy-llvm-openmp-dev-linux-arm64:
-    name: llvm-openmp-dev linux-arm64
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: linux/arm64
-      - name: Deploy llvm-openmp-dev
-        run: |
-          docker run --platform linux/arm64 ubuntu:22.04 /bin/bash -xel -c "
-          ${{ env.SETUP_BASE }}
-          ${{ env.SETUP_MINICONDA }}
-          ${{ env.SETUP_REPO }}
-          conda build --user python-for-hpc --label ${{ inputs.label }} \
-            -c python-for-hpc -c conda-forge \
-            --token ${{ secrets.ANACONDA_TOKEN }} \
-            buildscripts/conda-recipes/llvm-openmp-dev;
-          "
-
-  conda-deploy-llvmlite-linux-arm64:
-    needs: conda-deploy-llvm-openmp-dev-linux-arm64
-    name: llvmlite linux-arm64
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.8", "3.9", "3.10"]
-    steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: linux/arm64
-      - name: Deploy llvmlite
-        run: |
-          docker run --platform linux/arm64 ubuntu:22.04 /bin/bash -el -c "
-          ${{ env.SETUP_BASE }}
-          ${{ env.SETUP_MINICONDA }}
-          ${{ env.SETUP_REPO }}
-          conda build --user python-for-hpc --label ${{ inputs.label }} \
-            -c python-for-hpc -c conda-forge \
-            --python ${{ matrix.python-version}} --token ${{ secrets.ANACONDA_TOKEN }} \
-            buildscripts/conda-recipes/llvmlite
-          "
-
-  conda-deploy-numba-linux-arm64:
-    needs: conda-deploy-llvmlite-linux-arm64
-    name: numba linux-arm64
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.8", "3.9", "3.10"]
-    steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: linux/arm64
-      - name: Deploy numba
-        run: |
-          docker run --platform linux/arm64 ubuntu:22.04 /bin/bash -el -c "
-          ${{ env.SETUP_BASE }}
-          ${{ env.SETUP_MINICONDA }}
-          ${{ env.SETUP_REPO }}
-          conda build --user python-for-hpc --label ${{ inputs.label }} \
-            -c python-for-hpc -c conda-forge \
-            --python ${{ matrix.python-version}} --token ${{ secrets.ANACONDA_TOKEN }} \
-            buildscripts/conda-recipes/numba;
-          "
-
-  conda-deploy-pyomp-linux-arm64:
-    needs: conda-deploy-numba-linux-arm64
-    name: pyomp linux-arm64
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: linux/arm64
-      - name: Deploy pyomp
-        run: |
-          docker run --platform linux/arm64 ubuntu:22.04 /bin/bash -el -c "
-          ${{ env.SETUP_BASE }}
-          ${{ env.SETUP_MINICONDA }}
-          ${{ env.SETUP_REPO }}
-          conda build --user python-for-hpc --label ${{ inputs.label }} \
-            -c python-for-hpc -c conda-forge \
-            --token ${{ secrets.ANACONDA_TOKEN }} \
-            buildscripts/conda-recipes/pyomp;
-          "

.github/workflows/build-upload-conda-test.yml

@@ -2,13 +2,17 @@ name: Deploy conda pkgs (test)
 
 on:
   pull_request:
+    paths:
+      - "buildscripts/conda-recipes/**"
+      - ".github/workflows/build-upload-conda-test.yml"
+      - ".github/workflows/build-upload-conda-base.yml"
+      - "numba/**"
   workflow_dispatch:
 
 jobs:
   deploy-conda:
     uses: ./.github/workflows/build-upload-conda-base.yml
     with:
       label: test
-      commit: ${{ github.event.pull_request.head.sha }}
       env: .github/workflows/envs/env-test.yml
-    secrets: inherit
+    secrets: inherit

.github/workflows/build-upload-conda.yml

@@ -10,10 +10,9 @@ jobs:
     uses: ./.github/workflows/build-upload-conda-base.yml
     with:
       label: main
-      commit: ${{ github.sha }}
       env: .github/workflows/envs/env.yml
     secrets: inherit
   deploy-containers:
     needs: deploy-conda
     uses: ./.github/workflows/build-containers.yml
-    secrets: inherit
+    secrets: inherit

.gitlab-ci.yml

@@ -85,8 +85,6 @@ stages:
     strategy: depend
     forward:
       pipeline_variables: true
-  rules:
-    - if: ($CI_COMMIT_MESSAGE =~ /\[run gitlab ci\]/ || $CI_COMMIT_TAG)
 
 include:
   # Sets ID tokens for every job using `default:`

.gitlab/jobs/lassen.yml

@@ -66,21 +66,8 @@ build-llvm-openmp-dev-lassen:
   variables:
     PYOMP_CI_BUILD_PKG: "llvm-openmp-dev"
 
-build-llvmlite-lassen:
+build-pyomp-lassen:
   extends: [.base-job, .python-variants]
   needs: ["build-llvm-openmp-dev-lassen"]
-  variables:
-    PYOMP_CI_BUILD_PKG: "llvmlite"
-
-build-numba-lassen:
-  extends: [.base-job, .python-variants]
-  needs: ["build-llvmlite-lassen"]
-  variables:
-    PYOMP_CI_BUILD_PKG: "numba"
-
-build-pyomp-lassen:
-  extends: .base-job
-  needs: ["build-numba-lassen"]
   variables:
     PYOMP_CI_BUILD_PKG: "pyomp"
-

.gitlab/subscribed-pipelines.yml

@@ -23,8 +23,6 @@
              --data "{ \"state\": \"failure\", \"target_url\": \"${CI_PIPELINE_URL}\", \"description\": \"GitLab ${CI_MACHINE} down\", \"context\": \"ci/gitlab/${CI_MACHINE}\" }"
         exit 1
       fi
-  rules:
-    - if: ($CI_COMMIT_MESSAGE =~ /\[run gitlab ci\]/ || $CI_COMMIT_TAG)
 
 ###
 # Trigger a build-and-test pipeline for a machine.