Skip to content

Commit eb1cc07

Browse files
committed
Consolidate vinca files in a single vinca.yaml
1 parent f73d1ae commit eb1cc07

File tree

11 files changed

+338
-1946
lines changed

11 files changed

+338
-1946
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ jobs:
2424
- name: Generate recipes for linux-64
2525
run: |
2626
git clean -fdx
27-
cp vinca_linux_64.yaml vinca.yaml
2827
vinca --multiple --platform linux-64
2928
- name: Generate azure pipelines for linux-64
3029
run: |
@@ -50,7 +49,6 @@ jobs:
5049
- name: Generate recipes for osx-64
5150
run: |
5251
git clean -fdx
53-
cp vinca_osx.yaml vinca.yaml
5452
vinca --multiple --platform osx-64
5553
- name: Generate azure pipelines for osx-64
5654
run: |
@@ -76,7 +74,6 @@ jobs:
7674
- name: Generate recipes for osx-arm64
7775
run: |
7876
git clean -fdx
79-
cp vinca_osx_arm64.yaml vinca.yaml
8077
vinca --multiple --platform osx-arm64
8178
- name: Generate azure pipelines for osx-arm64
8279
run: |
@@ -102,7 +99,6 @@ jobs:
10299
- name: Generate recipes for win-64
103100
run: |
104101
git clean -fdx
105-
cp vinca_win.yaml vinca.yaml
106102
vinca --multiple --platform win-64
107103
- name: Generate azure pipelines for win-64
108104
run: |
@@ -128,7 +124,6 @@ jobs:
128124
- name: Generate recipes for linux-aarch64
129125
run: |
130126
git clean -fdx
131-
cp vinca_linux_aarch64.yaml vinca.yaml
132127
vinca --multiple --platform linux-aarch64
133128
- name: Generate azure pipelines for linux-aarch64
134129
run: |
@@ -154,7 +149,6 @@ jobs:
154149
- name: Generate recipes for emscripten-wasm32
155150
run: |
156151
git clean -fdx
157-
cp vinca_emscripten32.yaml vinca.yaml
158152
vinca --multiple --platform emscripten-wasm32
159153
sh -c 'find additional_recipes/* -maxdepth 0 -type d -exec ln -s ../{} recipes/ \;'
160154

.github/workflows/testpr.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,39 +79,34 @@ jobs:
7979
shell: bash -l {0}
8080
if: matrix.platform == 'linux-64'
8181
run: |
82-
cp vinca_linux_64.yaml vinca.yaml
8382
mkdir -p recipes
8483
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform linux-64 -m
8584
ls -la recipes
8685
- name: Generate recipes for emscripten-wasm32
8786
shell: bash -l {0}
8887
if: steps.filecheck.outputs.EMSCRIPTEN32_YAML_CHANGED == 1 && matrix.platform == 'emscripten-wasm32'
8988
run: |
90-
cp vinca_emscripten32.yaml vinca.yaml
9189
mkdir -p recipes
9290
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform emscripten-wasm32 -m -n
9391
ls -la recipes
9492
- name: Generate recipes for linux-aarch64
9593
shell: bash -l {0}
9694
if: matrix.platform == 'linux-aarch64'
9795
run: |
98-
cp vinca_linux_aarch64.yaml vinca.yaml
9996
mkdir -p recipes
10097
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform linux-aarch64 -m
10198
ls -la recipes
10299
- name: Generate recipes for osx-64
103100
shell: bash -l {0}
104101
if: matrix.platform == 'osx-64'
105102
run: |
106-
cp vinca_osx.yaml vinca.yaml
107103
mkdir -p recipes
108104
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform osx-64 -m
109105
ls -la recipes
110106
- name: Generate recipes for osx-arm64
111107
shell: bash -l {0}
112108
if: matrix.platform == 'osx-arm64'
113109
run: |
114-
cp vinca_osx_arm64.yaml vinca.yaml
115110
mkdir -p recipes
116111
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform osx-arm64 -m
117112
ls -la recipes
@@ -122,7 +117,6 @@ jobs:
122117
# Workaround for problem related to long paths
123118
echo "CONDA_BLD_PATH=C:\\bld\\" >> $GITHUB_ENV
124119
mkdir /c/bld
125-
cp vinca_win.yaml vinca.yaml
126120
mkdir -p recipes
127121
$HOME/.pixi/bin/pixi run -e beta -v vinca --platform win-64 -m
128122
ls -la recipes

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
vinca.yaml
21
recipes/
3-
*.bat
4-
*.sh
5-
*.ps1
62
*.json
73
.DS_Store
84
# pixi environments

pixi.toml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@ vinca = { git = "https://github.com/RoboStack/vinca.git", rev = "df7f9739c5e14ba
3333
#vinca = { path = "../vinca", editable = true }
3434

3535
[feature.beta.tasks]
36-
rename-file-emscripten = { cmd = "ln -s vinca_emscripten32.yaml vinca.yaml", depends-on = ["remove-file"] }
37-
generate-recipes = { cmd = "vinca -m", depends-on = ["rename-file"] }
38-
generate-recipes-emscripten = { cmd = "vinca -m --platform emscripten-wasm32", depends-on = ["rename-file-emscripten"] }
39-
remove-file = { cmd = "rm vinca.yaml; rm -rf recipes; mkdir recipes" }
36+
generate-recipes = { cmd = "vinca -m", depends-on = ["remove-file"] }
37+
generate-recipes-emscripten = { cmd = "vinca -m --platform emscripten-wasm32", depends-on = ["remove-file"] }
38+
remove-file = { cmd = "rm -rf recipes; mkdir recipes" }
4039
build_additional_recipes = { cmd = "rattler-build build --recipe-dir ./additional_recipes -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge --skip-existing" }
4140
copy_additional_recipes = { cmd = "sh -c 'find additional_recipes/* -maxdepth 0 -type d -exec ln -s ../{} recipes/ \\;'" }
4241
build = { cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge --skip-existing", depends-on = ["build_additional_recipes", "generate-recipes"] }
@@ -60,18 +59,3 @@ beta = ["beta"]
6059
"--test", "skip"
6160
]
6261
depends-on = ["generate-recipes-emscripten", "copy_additional_recipes"]
63-
64-
[target.linux-64.tasks]
65-
rename-file = { cmd = "ln -s vinca_linux_64.yaml vinca.yaml", depends-on = ["remove-file"] }
66-
67-
[target.osx-64.tasks]
68-
rename-file = { cmd = "ln -s vinca_osx.yaml vinca.yaml", depends-on = ["remove-file"] }
69-
70-
[target.osx-arm64.tasks]
71-
rename-file = { cmd = "ln -s vinca_osx_arm64.yaml vinca.yaml", depends-on = ["remove-file"] }
72-
73-
[target.linux-aarch64.tasks]
74-
rename-file = { cmd = "ln -s vinca_linux_aarch64.yaml vinca.yaml", depends-on = ["remove-file"] }
75-
76-
[target.win-64.tasks]
77-
rename-file = { cmd = "cp vinca_win.yaml vinca.yaml", depends-on = ["remove-file"] }

0 commit comments

Comments
 (0)