Skip to content

Commit a9acc8d

Browse files
committed
fix: github publish pages action
Signed-off-by: Alan Wandke <[email protected]>
1 parent df324ca commit a9acc8d

File tree

10 files changed

+30
-22
lines changed

10 files changed

+30
-22
lines changed

.github/workflows/pages.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88

99
permissions:
1010
contents: write
11+
packages: read
1112

1213
env:
1314
SITE_URL: 'https://NationalSecurityAgency.github.io/seabee/'
@@ -20,13 +21,19 @@ jobs:
2021
runs-on: ubuntu-24.04
2122

2223
container:
23-
image: ghcr.io/nationalsecurityagency/seabee-build-ubuntu-noble
24+
image: ghcr.io/nationalsecurityagency/seabee-build-ubuntu-noble:latest
2425

2526
steps:
2627
- name: Checkout code
2728
uses: actions/checkout@v4
28-
- name: Build docs
29-
run: make -C docs build
29+
- name: Build rust docs
30+
run: make docs
31+
- name: Build doxygen
32+
run: cd docs && doxygen
33+
- name: Poetry Install
34+
run: poetry install
35+
- name: Trust git directory
36+
run: git config --global --add safe.directory /__w/seabee/seabee
3037
- name: Deploy mkdocs
3138
run: cd docs && poetry run mkdocs gh-deploy --force
3239

.github/workflows/rust-clippy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-24.04
1313

1414
container:
15-
image: ghcr.io/nationalsecurityagency/seabee-build-ubuntu-jammy
15+
image: ghcr.io/nationalsecurityagency/seabee-build-ubuntu-jammy:latest
1616

1717
steps:
1818
- name: Checkout code

ci/fedora-41.Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ FROM ${DOCKER_MIRROR}fedora:41
55
LABEL org.opencontainers.image.source=https://github.com/NationalSecurityAgency/seabee
66

77
COPY scripts /scripts
8+
COPY pyproject.toml /pyproject.toml
89

910
# fedora image does not include python, python not added by update_dependencies.sh
1011
RUN dnf -y install python3
1112

1213
RUN DOCKER=1 /scripts/update_dependencies.sh \
1314
&& dnf clean all
1415

15-
# update the path for rust installation
16+
# update the path for rust and poetry installation
1617
ENV RUSTUP_HOME=/root/.rustup \
1718
CARGO_HOME=/root/.cargo \
18-
PATH=/root/.cargo/bin:$PATH
19+
PATH=/root/.cargo/bin:/root/.local/bin:$PATH

ci/fedora-42.Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ FROM ${DOCKER_MIRROR}fedora:42
55
LABEL org.opencontainers.image.source=https://github.com/NationalSecurityAgency/seabee
66

77
COPY scripts /scripts
8+
COPY pyproject.toml /pyproject.toml
89

910
# fedora image does not include python, python not added by update_dependencies.sh
1011
RUN dnf -y install python3
1112

1213
RUN DOCKER=1 /scripts/update_dependencies.sh \
1314
&& dnf clean all
1415

15-
# update the path for rust installation
16+
# update the path for rust and poetry installation
1617
ENV RUSTUP_HOME=/root/.rustup \
1718
CARGO_HOME=/root/.cargo \
18-
PATH=/root/.cargo/bin:$PATH
19+
PATH=/root/.cargo/bin:/root/.local/bin:$PATH

ci/rocky-9.Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ FROM ${DOCKER_MIRROR}rockylinux:9
55
LABEL org.opencontainers.image.source=https://github.com/NationalSecurityAgency/seabee
66

77
COPY scripts /scripts
8+
COPY pyproject.toml /pyproject.toml
89

910
RUN DOCKER=1 /scripts/update_dependencies.sh \
1011
&& dnf clean all \
1112
&& rm -rf /var/cache/dnf
1213

13-
# update the path for rust installation
14+
# update the path for rust and poetry installation
1415
ENV RUSTUP_HOME=/root/.rustup \
1516
CARGO_HOME=/root/.cargo \
16-
PATH=/root/.cargo/bin:$PATH
17+
PATH=/root/.cargo/bin:/root/.local/bin:$PATH

ci/ubuntu-jammy.Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ FROM ${DOCKER_MIRROR}ubuntu:jammy
55
LABEL org.opencontainers.image.source=https://github.com/NationalSecurityAgency/seabee
66

77
COPY scripts /scripts
8+
COPY pyproject.toml /pyproject.toml
89

910
RUN DOCKER=1 /scripts/update_dependencies.sh \
1011
&& rm -rf /var/lib/apt/lists/*
1112

12-
# update the path for rust installation
13+
# update the path for rust and poetry installation
1314
ENV RUSTUP_HOME=/root/.rustup \
1415
CARGO_HOME=/root/.cargo \
15-
PATH=/root/.cargo/bin:$PATH
16+
PATH=/root/.cargo/bin:/root/.local/bin:$PATH

ci/ubuntu-noble.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ COPY pyproject.toml /pyproject.toml
1010
RUN DOCKER=1 /scripts/update_dependencies.sh \
1111
&& rm -rf /var/lib/apt/lists/*
1212

13-
# update the path for rust installation
13+
# update the path for rust and poetry installation
1414
ENV RUSTUP_HOME=/root/.rustup \
1515
CARGO_HOME=/root/.cargo \
16-
PATH=/root/.cargo/bin:$PATH
16+
PATH=/root/.cargo/bin:/root/.local/bin:$PATH

docs/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ RUST_TGT = docs/assets/rust
1313
help:
1414
$(MKDOCS) --help
1515

16-
build: $(DEMO) rust-docs
16+
build: rust-docs
1717
doxygen
1818
$(BUILD_CMD)
1919

2020
# Doxygen and asciinema are not supported under this rule
2121
serve-dev:
2222
$(MKDOCS) serve
2323

24-
serve-build: $(DEMO) rust-docs
24+
serve-build: rust-docs
2525
SITE_URL="http://localhost:8080/" $(BUILD_CMD)
2626
$(PYTHON) -m http.server -d $(BUILD_PATH) 8080
2727

@@ -30,7 +30,7 @@ rust-docs:
3030
rm -r $(RUST_TGT) || true
3131
cp -r $(RUST_SRC) $(RUST_TGT)
3232

33-
$(DEMO): $(DEMO_SRC)
33+
demo: $(DEMO_SRC)
3434
if [ -z $$CI ]; then make -C .. release; fi
3535
if [ -z $$CI ]; then autocast --overwrite $(DEMO_SRC) $(DEMO); fi
3636

scripts/update_dependencies.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ version_greater_equal() {
3030
}
3131

3232
python_check() {
33-
# TODO remove this when we want to deploy docs
34-
# need to be able to see pyproject.toml and need path updated: `export PATH="$PATH:/root/.local/bin"`
35-
# if [ "$DOCKER" -eq 1 ]; then
36-
# return 0
37-
# fi
3833
if ! command -v "$PYTHON" &>/dev/null || ! version_greater_equal "$($PYTHON --version | cut -d" " -f2)" $PYTHON_VERSION; then
3934
printf "Compatible Python version not detected\n"
4035
printf "Please install Python %s or newer\n" "$PYTHON_VERSION"

scripts/update_root_dependencies.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ os_check() {
3737
# Install EPEL
3838
# https://www.redhat.com/en/blog/whats-epel-and-how-do-i-use-it
3939
dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
40+
# Enable CodeReady Builder for Doxygen
41+
dnf config-manager --set-enabled crb
4042
;;
4143
*) ;;
4244
esac

0 commit comments

Comments
 (0)