From cef4468dea9d9e3bdbf8cd0a3745020d3bcc269d Mon Sep 17 00:00:00 2001 From: Vahid Tavanashad Date: Thu, 13 Mar 2025 07:05:04 -0700 Subject: [PATCH 1/2] update windows CI --- .github/workflows/conda-package-cf.yml | 4 +++- .github/workflows/conda-package.yml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/conda-package-cf.yml b/.github/workflows/conda-package-cf.yml index 0d70ed8c..0e54bc2b 100644 --- a/.github/workflows/conda-package-cf.yml +++ b/.github/workflows/conda-package-cf.yml @@ -8,7 +8,9 @@ env: PACKAGE_NAME: mkl_fft MODULE_NAME: mkl_fft TEST_ENV_NAME: test_mkl_fft - + VER_SCRIPT1: "import json; f = open('ver.json', 'r'); j = json.load(f); f.close(); d = j['mkl_fft'][0];" + VER_SCRIPT2: "print('='.join((d[s] for s in ('version', 'build'))))" + jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 11b1c547..852a1dcf 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -8,6 +8,8 @@ env: PACKAGE_NAME: mkl_fft MODULE_NAME: mkl_fft TEST_ENV_NAME: test_mkl_fft + VER_SCRIPT1: "import json; f = open('ver.json', 'r'); j = json.load(f); f.close(); d = j['mkl_fft'][0];" + VER_SCRIPT2: "print('='.join((d[s] for s in ('version', 'build'))))" jobs: build: From 13762f0d2af75704138511145db647962687d4bb Mon Sep 17 00:00:00 2001 From: Vahid Tavanashad Date: Thu, 13 Mar 2025 08:31:57 -0700 Subject: [PATCH 2/2] add ECHO ON --- .github/workflows/conda-package-cf.yml | 1 + .github/workflows/conda-package.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/conda-package-cf.yml b/.github/workflows/conda-package-cf.yml index 0e54bc2b..5eeeb708 100644 --- a/.github/workflows/conda-package-cf.yml +++ b/.github/workflows/conda-package-cf.yml @@ -230,6 +230,7 @@ jobs: - name: Collect dependencies shell: cmd /C CALL {0} run: | + @ECHO ON IF NOT EXIST ver.json ( copy /Y ${{ env.workdir }}\ver.json . ) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 852a1dcf..3dadd9c8 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -228,6 +228,7 @@ jobs: - name: Collect dependencies shell: cmd /C CALL {0} run: | + @ECHO ON IF NOT EXIST ver.json ( copy /Y ${{ env.workdir }}\ver.json . )