diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ff3e1e0..90df384 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,13 +4,10 @@ on: [push, pull_request] jobs: build: - - strategy: - matrix: - os: [ubuntu-latest] - dotnet: [3.0.100] - runs-on: ${{ matrix.os }} - + permissions: + id-token: write # Needed for GitHub Pages deployment + pages: write + runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - name: Docker build @@ -19,10 +16,20 @@ jobs: docker create -ti --name dummy ancestors-map bash docker cp dummy:/build/src/Client/deploy . docker rm -f dummy - - name: Deploy - if: success() - uses: peaceiris/actions-gh-pages@v2.5.0 - env: - ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }} - PUBLISH_BRANCH: gh-pages - PUBLISH_DIR: deploy + # - name: Deploy + # if: success() + # uses: peaceiris/actions-gh-pages@v2.5.0 + # env: + # ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }} + # PUBLISH_BRANCH: gh-pages + # PUBLISH_DIR: deploy + - name: Setup Pages + uses: actions/configure-pages@v5 + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 + with: + # Upload entire repository + path: 'deploy' + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 diff --git a/.gitignore b/.gitignore index 946f215..d4b9ceb 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,6 @@ deploy .ionide/ .fake -.ionide \ No newline at end of file +.ionide +.flox +.yarn diff --git a/Dockerfile b/Dockerfile index fcbb5b2..3bf86dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,11 @@ -FROM nojaf/fable +FROM docker.io/nojaf/fable:2.7 WORKDIR /build -COPY . ./ +COPY .config . RUN dotnet tool restore -RUN dotnet fake build -t Build \ No newline at end of file +COPY paket.* . +RUN dotnet paket restore +COPY yarn.lock . +RUN yarn install --frozen-lockfile +COPY . . +RUN dotnet fake build -t Build +ENTRYPOINT dotnet fake build -t Run \ No newline at end of file diff --git a/README.md b/README.md index 5f0d7d5..3557ad0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,10 @@ # AncestorsMap [https://jindraivanek.github.io/AncestorsMap](https://jindraivanek.github.io/AncestorsMap) -:) \ No newline at end of file + + +## Build +`podman build -t ancestors-map .` + +## Run +`podman run -p 8080:8080 -it ancestors-map` and visit [http://localhost:8080](http://localhost:8080) \ No newline at end of file diff --git a/src/Client/Client.fs b/src/Client/Client.fs index 3e475a2..52915c2 100644 --- a/src/Client/Client.fs +++ b/src/Client/Client.fs @@ -222,7 +222,9 @@ let safeComponents = p [ ] [ strong [] [ str "AncestorsMap" ] - str " project by Jindřich Ivánek, GNU General Public License v3.0. " + str " project by " + a [ Href "https://jindraivanek.hashnode.dev" ] [ str "Jindřich Ivánek" ] + str ", GNU General Public License v3.0. " components ] let button txt onClick =