From 2ee0a2bba081f3a55d5859393090efecf2f8e269 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Fri, 4 Aug 2023 10:42:08 -0700 Subject: [PATCH] Fix scaladoc (deprecate FireSim CI docker cntnr) --- .github/actions/buildsetup/action.yml | 3 ++- .github/workflows/firesim-publish-scala-doc.yml | 10 ---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/actions/buildsetup/action.yml b/.github/actions/buildsetup/action.yml index 83dd1531..f621b483 100644 --- a/.github/actions/buildsetup/action.yml +++ b/.github/actions/buildsetup/action.yml @@ -5,7 +5,8 @@ runs: using: "composite" steps: - run: | - source /etc/profile.d/conda.sh + source /opt/conda/etc/profile.d/conda.sh + conda activate firesim ./build-setup.sh --skip-validate # All actions that run in a GH-hosted container source env.sh before # running their jobs. This ensures conda is in the runner's path, which diff --git a/.github/workflows/firesim-publish-scala-doc.yml b/.github/workflows/firesim-publish-scala-doc.yml index 5c1aa096..4bc42103 100644 --- a/.github/workflows/firesim-publish-scala-doc.yml +++ b/.github/workflows/firesim-publish-scala-doc.yml @@ -53,17 +53,7 @@ jobs: needs: change-filters if: needs.change-filters.outputs.needs-scala-doc == 'true' runs-on: ubuntu-20.04 - container: - image: firesim/firesim-ci:v1.3 - options: --entrypoint /bin/bash - env: - JAVA_HEAP_SIZE: 3500M # Default JVM maximum heap limit steps: - - run: | - sudo yum -y remove git git224 git224-core ius-release.noarch # remove any older git versions and collateral first from docker image - sudo yum -y install https://repo.ius.io/ius-release-el7.rpm # re-install for now - sudo yum -y install git236 # install working git version (must match machine-launch) - sudo yum -y install which # needed for build-setup - uses: actions/checkout@v3 - uses: ./.github/actions/repo-setup - uses: ./.github/actions/build-scala-doc