Skip to content

Commit 29de560

Browse files
committed
update workflows for new linters
1 parent 79eddae commit 29de560

2 files changed

Lines changed: 35 additions & 33 deletions

File tree

.github/workflows/build-with-clang.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ jobs:
6868
- name: Build mkl-service
6969
run: |
7070
source ${{ env.ONEAPI_ROOT }}/setvars.sh
71-
echo $CMPLR_ROOT
72-
export CC=$CMPLR_ROOT/bin/icx
71+
echo "$CMPLR_ROOT"
72+
export CC="$CMPLR_ROOT/bin/icx"
7373
export CFLAGS="${CFLAGS} -fno-fast-math"
7474
python setup.py develop
7575

.github/workflows/conda-package.yml

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -50,27 +50,27 @@ jobs:
5050
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
5151
5252
- name: Add conda to system path
53-
run: echo $CONDA/bin >> $GITHUB_PATH
53+
run: echo "$CONDA/bin" >> "$GITHUB_PATH"
5454

5555
- name: Install conda-build
5656
run: conda install conda-build
5757

5858
- name: Store conda paths as envs
5959
shell: bash -el {0}
6060
run: |
61-
echo "CONDA_BLD=/usr/share/miniconda/conda-bld/linux-64/" >> $GITHUB_ENV
62-
echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE/" >> $GITHUB_ENV
61+
echo "CONDA_BLD=/usr/share/miniconda/conda-bld/linux-64/" >> "$GITHUB_ENV"
62+
echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE/" >> "$GITHUB_ENV"
6363
6464
- name: Build conda package
6565
run: |
66-
CHANNELS="-c conda-forge -c conda-forge/label/python_rc -c https://software.repos.intel.com/python/conda --override-channels"
67-
VERSIONS="--python ${{ matrix.python }}"
68-
TEST="--no-test"
66+
CHANNELS=(-c conda-forge -c conda-forge/label/python_rc -c https://software.repos.intel.com/python/conda --override-channels)
67+
VERSIONS=(--python "${{ matrix.python }}")
68+
TEST=(--no-test)
6969
7070
conda build \
71-
$TEST \
72-
$VERSIONS \
73-
$CHANNELS \
71+
"${TEST[@]}" \
72+
"${VERSIONS[@]}" \
73+
"${CHANNELS[@]}" \
7474
conda-recipe
7575
7676
- name: Upload artifact
@@ -127,8 +127,8 @@ jobs:
127127
- name: Store conda paths as envs
128128
shell: bash -el {0}
129129
run: |
130-
echo "CONDA_BLD=$CONDA_PREFIX\\conda-bld\\win-64\\" >> $GITHUB_ENV
131-
echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE\\" >> $GITHUB_ENV
130+
echo "CONDA_BLD=$CONDA_PREFIX\\conda-bld\\win-64\\" >> "$GITHUB_ENV"
131+
echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE\\" >> "$GITHUB_ENV"
132132
133133
- name: Build conda package
134134
run: conda build --no-test --python ${{ matrix.python }} -c https://software.repos.intel.com/python/conda -c conda-forge -c conda-forge/label/python_rc --override-channels conda-recipe
@@ -165,27 +165,28 @@ jobs:
165165
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
166166

167167
- name: Add conda to system path
168-
run: echo $CONDA/bin >> $GITHUB_PATH
168+
run: echo "$CONDA/bin" >> "$GITHUB_PATH"
169169

170170
- name: Install conda-build
171171
run: conda install conda-build
172172

173173
- name: Create conda channel
174174
run: |
175-
mkdir -p $GITHUB_WORKSPACE/channel/linux-64
176-
conda index $GITHUB_WORKSPACE/channel || exit 1
177-
mv ${PACKAGE_NAME}-*.conda $GITHUB_WORKSPACE/channel/linux-64 || exit 1
178-
conda index $GITHUB_WORKSPACE/channel || exit 1
175+
mkdir -p "$GITHUB_WORKSPACE/channel/linux-64"
176+
conda index "$GITHUB_WORKSPACE/channel" || exit 1
177+
mv "${PACKAGE_NAME}"-*.conda "$GITHUB_WORKSPACE/channel/linux-64" || exit 1
178+
conda index "$GITHUB_WORKSPACE/channel" || exit 1
179179
# Test channel
180-
conda search $PACKAGE_NAME -c $GITHUB_WORKSPACE/channel --override-channels --info --json > $GITHUB_WORKSPACE/ver.json
180+
conda search "$PACKAGE_NAME" -c "$GITHUB_WORKSPACE/channel" --override-channels --info --json > "$GITHUB_WORKSPACE/ver.json"
181181
cat ver.json
182182
183183
- name: Collect dependencies
184184
run: |
185-
. $CONDA/etc/profile.d/conda.sh
186-
CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
187-
export PACKAGE_VERSION=$(python -c "${VER_SCRIPT1} ${VER_SCRIPT2}")
188-
conda create -n ${{ env.TEST_ENV_NAME }} $PACKAGE_NAME=${PACKAGE_VERSION} python=${{ matrix.python }} $CHANNELS --only-deps --dry-run > lockfile
185+
. "$CONDA/etc/profile.d/conda.sh"
186+
CHANNELS=(-c "$GITHUB_WORKSPACE/channel" -c conda-forge -c conda-forge/label/python_rc -c https://software.repos.intel.com/python/conda --override-channels)
187+
PACKAGE_VERSION="$(python -c "${VER_SCRIPT1} ${VER_SCRIPT2}")"
188+
export PACKAGE_VERSION
189+
conda create -n "${{ env.TEST_ENV_NAME }}" "$PACKAGE_NAME=$PACKAGE_VERSION" "python=${{ matrix.python }}" "${CHANNELS[@]}" --only-deps --dry-run > lockfile
189190
cat lockfile
190191
191192
- name: Set pkgs_dirs
@@ -206,16 +207,17 @@ jobs:
206207
207208
- name: Install mkl-service
208209
run: |
209-
. $CONDA/etc/profile.d/conda.sh
210-
CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
211-
export PACKAGE_VERSION=$(python -c "${VER_SCRIPT1} ${VER_SCRIPT2}")
212-
conda create -n ${{ env.TEST_ENV_NAME }} $PACKAGE_NAME=${PACKAGE_VERSION} pytest python=${{ matrix.python }} $CHANNELS
210+
. "$CONDA/etc/profile.d/conda.sh"
211+
CHANNELS=(-c "$GITHUB_WORKSPACE/channel" -c conda-forge -c conda-forge/label/python_rc -c https://software.repos.intel.com/python/conda --override-channels)
212+
PACKAGE_VERSION="$(python -c "${VER_SCRIPT1} ${VER_SCRIPT2}")"
213+
export PACKAGE_VERSION
214+
conda create -n "${{ env.TEST_ENV_NAME }}" "$PACKAGE_NAME=$PACKAGE_VERSION" pytest "python=${{ matrix.python }}" "${CHANNELS[@]}"
213215
# Test installed packages
214216
conda list
215217
216218
- name: Run tests
217219
run: |
218-
. $CONDA/etc/profile.d/conda.sh
220+
. "$CONDA/etc/profile.d/conda.sh"
219221
conda activate ${{ env.TEST_ENV_NAME }}
220222
pytest -vv --pyargs ${{ env.MODULE_NAME }}
221223
@@ -250,13 +252,13 @@ jobs:
250252

251253
- name: Create conda channel
252254
run: |
253-
mkdir ${{ env.GITHUB_WORKSPACE }}\channel\win-64
254-
move ${{ env.PACKAGE_NAME }}-*.conda ${{ env.GITHUB_WORKSPACE }}\channel\win-64
255-
python -m conda_index ${{ env.GITHUB_WORKSPACE }}/channel
255+
mkdir ${{ env.GITHUB_WORKSPACE }}/channel/win-64
256+
move ${{ env.PACKAGE_NAME }}-*.conda ${{ env.GITHUB_WORKSPACE }}/channel/win-64
257+
python -m conda_index "${{ env.GITHUB_WORKSPACE }}/channel"
256258
257259
# Test channel
258-
conda search ${{ env.PACKAGE_NAME }} -c ${{ env.GITHUB_WORKSPACE }}/channel --override-channels --info --json > ${{ env.GITHUB_WORKSPACE }}\ver.json
259-
more ${{ env.GITHUB_WORKSPACE }}\ver.json
260+
conda search ${{ env.PACKAGE_NAME }} -c ${{ env.GITHUB_WORKSPACE }}/channel --override-channels --info --json > ${{ env.GITHUB_WORKSPACE }}/ver.json
261+
more ${{ env.GITHUB_WORKSPACE }}/ver.json
260262
261263
- name: Collect dependencies
262264
shell: cmd

0 commit comments

Comments
 (0)