diff --git a/.github/workflows/build_publish.yml b/.github/workflows/build_publish.yml new file mode 100644 index 000000000..576dbfcfd --- /dev/null +++ b/.github/workflows/build_publish.yml @@ -0,0 +1,48 @@ +name: Build and Publish Site + +on: + # allows us to run workflows manually + workflow_dispatch: + pull_request: + push: + +jobs: + build-and-upload: + runs-on: ubuntu-latest + + steps: + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Checkout cyclus.github.com + uses: actions/checkout@v4 + + - name: Build Site + run: | + make docker-html + + - name: debug + run: | + ls -l + + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 + with: + path: gh-build + + deploy: + runs-on: ubuntu-latest + needs: build-and-upload + + permissions: + pages: write + id-token: write + + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + + steps: + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 \ No newline at end of file diff --git a/Makefile b/Makefile index e0386ac76..3e51bdf7d 100644 --- a/Makefile +++ b/Makefile @@ -95,7 +95,8 @@ gh-publish: make gh-publish-only docker-gh-preview docker-html: - docker run -w /cyclus.github.com -v $(PWD):/cyclus.github.com cyclus/fuelcycle.org-deps bash -c "make gh-preview && chmod -R 777 $(BUILDDIR)" + docker build -f docker/fuelcycle.org-deps/Dockerfile -t fuelcycle.org-deps . + docker run -w /cyclus.github.com -v $(PWD):/cyclus.github.com fuelcycle.org-deps bash -c "make gh-preview && chmod -R 777 $(BUILDDIR)" docker-gh-publish: make clean diff --git a/docker/fuelcycle.org-deps/Dockerfile b/docker/fuelcycle.org-deps/Dockerfile index 1df836ed5..63eab0ca7 100644 --- a/docker/fuelcycle.org-deps/Dockerfile +++ b/docker/fuelcycle.org-deps/Dockerfile @@ -1,9 +1,7 @@ -FROM cyclus/cymetric +FROM ghcr.io/cyclus/cymetric_22.04_apt/cymetric:latest RUN apt-get update -RUN apt-get install -y --force-yes wget -RUN apt-get install -y --force-yes python3-pip -RUN pip3 install sphinx sphinxcontrib-bibtex -RUN pip3 install cloud-sptheme==1.6 +RUN apt-get install -y --force-yes wget python3-pip +RUN python -m pip install sphinx sphinxcontrib-bibtex cloud-sptheme==1.6