riscv
/
OpenFPGA
mirror of https://github.com/lnis-uofu/OpenFPGA.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[ci] now revert to Ubuntu 18.04, see if docker can work or not

This commit is contained in:
tangxifan 2022-08-26 21:09:27 -07:00
parent f423fd1603
commit 53a0dcec90
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.github/workflows/build.yml vendored
View File

@ -67,7 +67,7 @@ jobs:
needs: change_detect needs: change_detect
if: ${{ fromJSON(needs.change_detect.outputs.source_modified) }} if: ${{ fromJSON(needs.change_detect.outputs.source_modified) }}
name: ${{ matrix.config.name }} name: ${{ matrix.config.name }}
runs-on: ubuntu-20.04 runs-on: ubuntu-18.04
# Note: dependencies are installed in the container. See details about dependency list in docker/Dockerfile.master # Note: dependencies are installed in the container. See details about dependency list in docker/Dockerfile.master
# Comment the line out when base image is built again # Comment the line out when base image is built again
#container: ghcr.io/${{ needs.change_detect.outputs.docker_repo }}/openfpga-build-${{ matrix.config.cc}} #container: ghcr.io/${{ needs.change_detect.outputs.docker_repo }}/openfpga-build-${{ matrix.config.cc}}
@ -76,31 +76,31 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
config: config:
- name: "Build Compatibility: GCC-7 (Ubuntu 20.04)" - name: "Build Compatibility: GCC-7 (Ubuntu 18.04)"
cc: gcc-7 cc: gcc-7
cxx: g++-7 cxx: g++-7
- name: "Build Compatibility: GCC-8 (Ubuntu 20.04)" - name: "Build Compatibility: GCC-8 (Ubuntu 18.04)"
cc: gcc-8 cc: gcc-8
cxx: g++-8 cxx: g++-8
- name: "Build Compatibility: GCC-9 (Ubuntu 20.04)" - name: "Build Compatibility: GCC-9 (Ubuntu 18.04)"
cc: gcc-9 cc: gcc-9
cxx: g++-9 cxx: g++-9
- name: "Build Compatibility: GCC-10 (Ubuntu 20.04)" - name: "Build Compatibility: GCC-10 (Ubuntu 18.04)"
cc: gcc-10 cc: gcc-10
cxx: g++-10 cxx: g++-10
- name: "Build Compatibility: GCC-11 (Ubuntu 20.04)" - name: "Build Compatibility: GCC-11 (Ubuntu 18.04)"
cc: gcc-11 cc: gcc-11
cxx: g++-11 cxx: g++-11
- name: "Build Compatibility: Clang-6 (Ubuntu 20.04)" - name: "Build Compatibility: Clang-6 (Ubuntu 18.04)"
cc: clang-6.0 cc: clang-6.0
cxx: clang++-6.0 cxx: clang++-6.0
- name: "Build Compatibility: Clang-7 (Ubuntu 20.04)" - name: "Build Compatibility: Clang-7 (Ubuntu 18.04)"
cc: clang-7 cc: clang-7
cxx: clang++-7 cxx: clang++-7
- name: "Build Compatibility: Clang-8 (Ubuntu 20.04)" - name: "Build Compatibility: Clang-8 (Ubuntu 18.04)"
cc: clang-8 cc: clang-8
cxx: clang++-8 cxx: clang++-8
- name: "Build Compatibility: Clang-10 (Ubuntu 20.04)" - name: "Build Compatibility: Clang-10 (Ubuntu 18.04)"
cc: clang-10 cc: clang-10
cxx: clang++-10 cxx: clang++-10
# Define the steps to run the build job # Define the steps to run the build job
@ -192,7 +192,7 @@ jobs:
ghcr.io/${{ needs.change_detect.outputs.docker_repo }}/openfpga-master:${{ needs.change_detect.outputs.sha_short }} ghcr.io/${{ needs.change_detect.outputs.docker_repo }}/openfpga-master:${{ needs.change_detect.outputs.sha_short }}
linux_regression_tests: linux_regression_tests:
name: linux_regression_tests name: linux_regression_tests
runs-on: ubuntu-20.04 runs-on: ubuntu-18.04
needs: [linux_build, change_detect] needs: [linux_build, change_detect]
container: ghcr.io/${{ needs.change_detect.outputs.docker_repo }}/openfpga-env container: ghcr.io/${{ needs.change_detect.outputs.docker_repo }}/openfpga-env
strategy: strategy:
@ -247,7 +247,7 @@ jobs:
needs: change_detect needs: change_detect
if: ${{ !fromJSON(needs.change_detect.outputs.source_modified) }} if: ${{ !fromJSON(needs.change_detect.outputs.source_modified) }}
name: docker_regression_tests name: docker_regression_tests
runs-on: ubuntu-20.04 runs-on: ubuntu-18.04
container: container:
image: ghcr.io/${{ needs.change_detect.outputs.docker_repo }}/openfpga-master:latest image: ghcr.io/${{ needs.change_detect.outputs.docker_repo }}/openfpga-master:latest
options: --user root --workdir /home/openfpga_user options: --user root --workdir /home/openfpga_user
@ -275,7 +275,7 @@ jobs:
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
submodules: true submodules: true
- name: ${{matrix.config.name}}_GCC-8_(Ubuntu 20.04) - name: ${{matrix.config.name}}_GCC-8_(Ubuntu 18.04)
shell: bash shell: bash
run: | run: |
bash .github/workflows/install_dependencies_run.sh bash .github/workflows/install_dependencies_run.sh

2
docker/Dockerfile.base
View File

@ -1,4 +1,4 @@
FROM ubuntu:20.04 FROM ubuntu:18.04
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install software-properties-common -y RUN apt-get update && apt-get install software-properties-common -y
# 18.04 includes 2.17 but github requires 2.18+ to support submodules. # 18.04 includes 2.17 but github requires 2.18+ to support submodules.

2
docker/Dockerfile.env
View File

@ -11,4 +11,4 @@ RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 2
RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 1 RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 1
ADD requirements.txt requirements.txt ADD requirements.txt requirements.txt
ENV PYTHON_EXEC=python3.8 ENV PYTHON_EXEC=python3.8
RUN ${PYTHON_EXEC} -m pip install -r requirements.txt RUN ${PYTHON_EXEC} -m pip install -r requirements.txt