diff --git a/.github/scripts/prepare_environment.sh b/.github/scripts/prepare_environment.sh index e3ea1bb..2a86609 100755 --- a/.github/scripts/prepare_environment.sh +++ b/.github/scripts/prepare_environment.sh @@ -35,11 +35,6 @@ source "$F4PGA_INSTALL_DIR_FAM"/conda/etc/profile.d/conda.sh echo '::endgroup::' -echo '::group::Create environment' -conda env create -f test/envs/"$FPGA_FAM"/environment.yml -echo '::endgroup::' - - echo '::group::Install arch-defs' mkdir -p "$F4PGA_INSTALL_DIR_FAM"/install case "$FPGA_FAM" in @@ -61,6 +56,11 @@ esac echo '::endgroup::' +echo '::group::Create environment' +conda env create -f $F4PGA_INSTALL_DIR_FAM/install/"$FPGA_FAM"_env/"$FPGA_FAM"_environment.yml +echo '::endgroup::' + + echo '::group::Add f4pga-env' F4PGA_DIR_ROOT='install' diff --git a/test/envs/eos-s3/environment.yml b/test/envs/eos-s3/environment.yml deleted file mode 100644 index a9ebbdf..0000000 --- a/test/envs/eos-s3/environment.yml +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2020-2022 F4PGA Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 - -name: eos-s3 - -channels: - - litex-hub - -dependencies: - - litex-hub::yosys=0.19_10_g0098b32c6=20220706_001518_py37 - - litex-hub::symbiflow-yosys-plugins=1.0.0_7_1002_gd149693=20220706_001518 - - litex-hub::vtr-optimized=8.0.0_5664_gb7a94b90a=20220706_001518 - - make - - lxml - - simplejson - - git - - pip - - pip: - - -r requirements.txt diff --git a/test/envs/eos-s3/requirements.txt b/test/envs/eos-s3/requirements.txt deleted file mode 100644 index d9ddfcd..0000000 --- a/test/envs/eos-s3/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -python-constraint -serial -git+https://github.com/QuickLogic-Corp/quicklogic-fasm@607849ec0bdef8740be33dbaa49d15a3d400f809 -#https://github.com/chipsalliance/f4pga/archive/main.zip#subdirectory=f4pga diff --git a/test/envs/xc7/environment.yml b/test/envs/xc7/environment.yml deleted file mode 100644 index 01ed7a6..0000000 --- a/test/envs/xc7/environment.yml +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (C) 2020-2022 F4PGA Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 - -name: xc7 - -channels: - - litex-hub - -dependencies: - - litex-hub::prjxray-tools=0.1_3015_gae546d6b=20220708_203356 - - litex-hub::prjxray-db=0.0_257_g0a0adde=20220708_203356 - - litex-hub::vtr-optimized=8.0.0_5699_g25e723a24=20220708_203356 - - litex-hub::yosys=0.19_21_ga82eff2e2=20220720_081021_py37 - - litex-hub::symbiflow-yosys-plugins=1.0.0_7_1027_g52cdcc4=20220720_081021 - - make - - lxml - - git - - pip - - pip: - - -r requirements.txt diff --git a/test/envs/xc7/requirements.txt b/test/envs/xc7/requirements.txt deleted file mode 100644 index 2e31550..0000000 --- a/test/envs/xc7/requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -python-constraint -pyyaml -fasm -git+https://github.com/SymbiFlow/prjxray.git@e25c20a8f158cc5e94eb62e3b74e16fc9d6c1d26#egg=prjxray -git+https://github.com/symbiflow/xc-fasm.git@14afc2bae24cbf6ee5e7d057a58b4cbd776358d0#egg=xc-fasm -#https://github.com/chipsalliance/f4pga/archive/main.zip#subdirectory=f4pga