Skip to content

Commit

Permalink
Move to using shared material library.
Browse files Browse the repository at this point in the history
  • Loading branch information
Lattyware committed Jun 2, 2022
1 parent a6035da commit d3e816e
Show file tree
Hide file tree
Showing 58 changed files with 881 additions and 1,683 deletions.
5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ updates:
schedule:
interval: "weekly"

- package-ecosystem: "gitsubmodule"
directory: "/client/elm-material"
schedule:
interval: "weekly"

- package-ecosystem: "npm"
directory: "/server"
schedule:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
steps:
- name: Checkout repository.
uses: actions/checkout@v3
with:
submodules: true

- name: Get version from tag.
uses: little-core-labs/[email protected]
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "client/elm-material"]
path = client/elm-material
url = [email protected]:Lattyware/elm-material.git
4 changes: 3 additions & 1 deletion client/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ RUN ["apk", "add", "--no-cache", "python3", "make", "g++"]
ENV MD_VERSION ${VERSION}
ENV WEBPACK_MODE ${MODE}

COPY ["./elm-material/package.json", "./elm-material/package-lock.json", "./"]
COPY ["./package.json", "./package-lock.json", "./"]
RUN ["npm", "ci"]

COPY ["./elm-material", "./elm-material"]
COPY ["./tsconfig.json", "postcss.config.js", "./webpack.config.js", "./elm.json", "./"]
COPY ["./src", "./src"]
COPY ["./assets", "./assets"]
Expand Down Expand Up @@ -49,5 +51,5 @@ LABEL org.opencontainers.image.licenses="AGPL-3.0+"
LABEL org.opencontainers.image.title="Massive Decks (Client)"
LABEL org.opencontainers.image.description="The web client for Massive Decks, a comedy party game."

COPY --from=static ["/md/dist", "/usr/share/nginx/html/"]
COPY --from=static ["/", "/usr/share/nginx/html/"]
COPY ["./nginx.conf", "/etc/nginx/nginx.conf"]
1 change: 1 addition & 0 deletions client/elm-material
Submodule elm-material added at 035cca
3 changes: 2 additions & 1 deletion client/elm.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"type": "application",
"source-directories": [
"./src/elm"
"./src/elm",
"./elm-material/src/elm"
],
"elm-version": "0.19.1",
"dependencies": {
Expand Down
Loading

0 comments on commit d3e816e

Please sign in to comment.