From caa06561646acfef123322deaf75c785e05c9162 Mon Sep 17 00:00:00 2001 From: Karl Higley Date: Fri, 13 Jan 2023 12:45:36 -0500 Subject: [PATCH] Apply formatting changes from `prettier` --- .github/workflows/cpu-ci.yml | 94 ++++++++++++++++++------------------ .github/workflows/gpu-ci.yml | 30 ++++++------ 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/.github/workflows/cpu-ci.yml b/.github/workflows/cpu-ci.yml index 7a77b373e50..7d9f914b02b 100644 --- a/.github/workflows/cpu-ci.yml +++ b/.github/workflows/cpu-ci.yml @@ -18,52 +18,52 @@ jobs: os: [ubuntu-latest] steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Install Ubuntu packages - run: | - sudo apt-get update -y - sudo apt-get install -y protobuf-compiler - - name: Install and upgrade python packages - run: | - python -m pip install --upgrade pip setuptools==59.4.0 wheel tox pybind11 - python -m pip uninstall protobuf -y - python -m pip install --no-binary=protobuf protobuf - - name: Generate package for pypi - run: | - python setup.py sdist bdist_wheel - - name: Check distribution is valid - run: | - ./ci/check_dist.sh - - name: Run tests - run: | - ref_type=${{ github.ref_type }} - branch=main - if [[ $ref_type == "tag"* ]] - then - raw=$(git branch -r --contains ${{ github.ref_name }}) - branch=${raw/origin\/} - fi - tox -e test-cpu -- $branch - - name: Upload pypi artifacts to github - uses: actions/upload-artifact@v3 - with: - name: dist - path: dist - - name: Generate package for conda - id: conda_build - run: | - conda update conda - conda install conda-build pybind11 - conda build --python ${{ matrix.python-version }} . -c defaults -c conda-forge -c numba -c rapidsai -c nvidia --output-folder ./conda_packages - export CONDA_PACKAGE=$(conda build --python ${{ matrix.python-version }} . -c defaults -c conda-forge -c numba -c rapidsai -c nvidia --output-folder ./conda_packages --output) - echo "conda_package : $CONDA_PACKAGE" - echo "conda_package=$CONDA_PACKAGE" >> $GITHUB_OUTPUT + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Install Ubuntu packages + run: | + sudo apt-get update -y + sudo apt-get install -y protobuf-compiler + - name: Install and upgrade python packages + run: | + python -m pip install --upgrade pip setuptools==59.4.0 wheel tox pybind11 + python -m pip uninstall protobuf -y + python -m pip install --no-binary=protobuf protobuf + - name: Generate package for pypi + run: | + python setup.py sdist bdist_wheel + - name: Check distribution is valid + run: | + ./ci/check_dist.sh + - name: Run tests + run: | + ref_type=${{ github.ref_type }} + branch=main + if [[ $ref_type == "tag"* ]] + then + raw=$(git branch -r --contains ${{ github.ref_name }}) + branch=${raw/origin\/} + fi + tox -e test-cpu -- $branch + - name: Upload pypi artifacts to github + uses: actions/upload-artifact@v3 + with: + name: dist + path: dist + - name: Generate package for conda + id: conda_build + run: | + conda update conda + conda install conda-build pybind11 + conda build --python ${{ matrix.python-version }} . -c defaults -c conda-forge -c numba -c rapidsai -c nvidia --output-folder ./conda_packages + export CONDA_PACKAGE=$(conda build --python ${{ matrix.python-version }} . -c defaults -c conda-forge -c numba -c rapidsai -c nvidia --output-folder ./conda_packages --output) + echo "conda_package : $CONDA_PACKAGE" + echo "conda_package=$CONDA_PACKAGE" >> $GITHUB_OUTPUT - name: Upload conda artifacts to github uses: actions/upload-artifact@v3 @@ -135,4 +135,4 @@ jobs: env: ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }} run: | - anaconda -t $ANACONDA_TOKEN upload -u nvidia conda/*.tar.bz2 \ No newline at end of file + anaconda -t $ANACONDA_TOKEN upload -u nvidia conda/*.tar.bz2 diff --git a/.github/workflows/gpu-ci.yml b/.github/workflows/gpu-ci.yml index 079da77dcaa..c379199e0f5 100644 --- a/.github/workflows/gpu-ci.yml +++ b/.github/workflows/gpu-ci.yml @@ -3,11 +3,11 @@ name: GPU CI on: workflow_dispatch: push: - branches: [ main ] + branches: [main] tags: - v* pull_request: - branches: [ main ] + branches: [main] types: [opened, synchronize, reopened, closed] jobs: @@ -15,16 +15,16 @@ jobs: runs-on: 2GPU steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Run tests - run: | - ref_type=${{ github.ref_type }} - branch=main - if [[ $ref_type == "tag"* ]] - then - raw=$(git branch -r --contains ${{ github.ref_name }}) - branch=${raw/origin\/} - fi - cd ${{ github.workspace }}; tox -e test-gpu -- $branch + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Run tests + run: | + ref_type=${{ github.ref_type }} + branch=main + if [[ $ref_type == "tag"* ]] + then + raw=$(git branch -r --contains ${{ github.ref_name }}) + branch=${raw/origin\/} + fi + cd ${{ github.workspace }}; tox -e test-gpu -- $branch