From d80279a3b129796202efb020ba48363d2fc6c6f0 Mon Sep 17 00:00:00 2001 From: Gareth Latty Date: Sat, 28 Dec 2019 13:54:38 +0000 Subject: [PATCH] Move v2 to master. --- .github/workflows/publish_docker_images.yml | 2 +- .travis.yml | 29 --------------------- README.md | 18 ++++++++----- client/package-lock.json | 6 ++--- client/package.json | 5 ++-- server/src/ts/util.ts | 2 +- 6 files changed, 18 insertions(+), 44 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/publish_docker_images.yml b/.github/workflows/publish_docker_images.yml index f89aacb..fbb332a 100644 --- a/.github/workflows/publish_docker_images.yml +++ b/.github/workflows/publish_docker_images.yml @@ -3,7 +3,7 @@ name: Build and publish docker images. on: push: branches: - - v2 + - master tags: - v*.*.* diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ccfea3b..0000000 --- a/.travis.yml +++ /dev/null @@ -1,29 +0,0 @@ -language: sh - -services: - - docker - -sudo: required - -env: - global: - - COMMIT_VERSION=${TRAVIS_COMMIT}-dev - - TAG_VERSION=${TRAVIS_TAG} - - VERSION=${TAG_VERSION:-${COMMIT_VERSION}} - matrix: - - COMPONENT=server - - COMPONENT=client - -before_install: - - cd ${COMPONENT} - -install: true - -script: - - docker build -t massivedecks/${COMPONENT}:${COMMIT_VERSION} --build-arg VCS_REF="${TRAVIS_COMMIT}" --build-arg BUILD_DATE="$(date --rfc-3339=seconds)" --build-arg VERSION="${VERSION}" . - -deploy: - provider: script - script: bash ../docker_push "${COMPONENT}" "${COMMIT_VERSION}" "${TAG_VERSION}" - on: - branch: v2 diff --git a/README.md b/README.md index 7097760..d6d6a7f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# [Massive Decks ![Massive Decks](https://raw.githubusercontent.com/Lattyware/massivedecks/v2/client/assets/images/icon.png)][hosted] +# [Massive Decks ![Massive Decks](https://raw.githubusercontent.com/Lattyware/massivedecks/master/client/assets/images/icon.png)][hosted] -[![Build Status](https://img.shields.io/github/workflow/status/Lattyware/massivedecks/Build%20and%20publish%20docker%20images./v2)](https://github.com/Lattyware/massivedecks/actions) +[![Build Status](https://img.shields.io/github/workflow/status/Lattyware/massivedecks/Build%20and%20publish%20docker%20images.)](https://github.com/Lattyware/massivedecks/actions) ![License](https://img.shields.io/github/license/Lattyware/massivedecks) Massive Decks is a comedy party game based on [Cards against Humanity][cah]. Play with friends! It works great with a @@ -27,24 +27,28 @@ If you would like to run an instance of Massive Decks, there are a couple of opt ### Docker -[Server](https://hub.docker.com/repository/docker/massivedecks) / [Client](https://hub.docker.com/repository/docker/massivedecks/client/general) +[Server](https://hub.docker.com/repository/docker/massivedecks/server/general) / [Client](https://hub.docker.com/repository/docker/massivedecks/client/general) -Also see [`docker-compose.yml`](https://github.com/Lattyware/massivedecks/blob/v2/docker-compose.yml). The client image +Also see [`docker-compose.yml`](https://github.com/Lattyware/massivedecks/blob/master/docker-compose.yml). The client image is an nginx server that both serves the static web client and acts as a proxy for the server. As such, the server should not be exposed publicly directly. ### Heroku -[![Deploy to Heroku](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/Lattyware/massivedecks/tree/v2) +[![Deploy to Heroku](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/Lattyware/massivedecks) ## Contributing If you have any problems with the game, please [raise an issue][issue]. If you would like to help develop the game, -check [the wiki][wiki] for how to get started. +check [the wiki's contribution guide][contributing] for how to get started. + +The game has a system for translation, and if you would like to provide translation to a new language, please see +[the guide on the wiki][translation]. [issue]: https://github.com/Lattyware/massivedecks/issues/new -[wiki]: https://github.com/Lattyware/massivedecks/wiki +[contributing]: https://github.com/Lattyware/massivedecks/wiki/Contributing +[translation]: https://github.com/Lattyware/massivedecks/wiki/Translation ## Credits diff --git a/client/package-lock.json b/client/package-lock.json index 02b9906..cdb6120 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -11109,9 +11109,9 @@ } }, "webpack": { - "version": "4.41.4", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.4.tgz", - "integrity": "sha512-Lc+2uB6NjpCWsHI3trkoISOI64h9QYIXenbEWj3bn3oyjfB1lEBXjWAfAyY2sM0rZn41oD5V91OLwKRwS6Wp8Q==", + "version": "4.41.5", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.5.tgz", + "integrity": "sha512-wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw==", "dev": true, "requires": { "@webassemblyjs/ast": "1.8.5", diff --git a/client/package.json b/client/package.json index 9c0d703..c28c9c6 100644 --- a/client/package.json +++ b/client/package.json @@ -8,8 +8,7 @@ "repository": "github:Lattyware/massivedecks", "scripts": { "prepublishOnly": "npm run build", - "prebuild": "sed -i \"s/\\\"dev\\\"/\\\"${MD_VERSION:-dev}\\\"/g\" src/elm/MassiveDecks/Version.elm", - "heroku-prebuild": "sed -i \"s/\\\"dev\\\"/\\\"${HEROKU_SLUG_COMMIT:-dev}\\\"/g\" src/elm/MassiveDecks/Version.elm", + "prebuild": "sed -i \"s/\\\"dev\\\"/\\\"${MD_VERSION:-${HEROKU_SLUG_COMMIT:-dev}}\\\"/g\" src/elm/MassiveDecks/Version.elm", "build": "npx webpack --mode=production", "dev": "npx webpack-dev-server --mode=development" }, @@ -58,7 +57,7 @@ "ts-loader": "^6.2.1", "typescript": "^3.7.4", "uglifyjs-webpack-plugin": "^2.2.0", - "webpack": "^4.41.4", + "webpack": "^4.41.5", "webpack-cli": "^3.3.10", "webpack-dev-server": "^3.10.1" } diff --git a/server/src/ts/util.ts b/server/src/ts/util.ts index ac00f17..8f16ccc 100644 --- a/server/src/ts/util.ts +++ b/server/src/ts/util.ts @@ -55,7 +55,7 @@ export const mapToObject = (map: Map): { [key: string]: T } => */ export function counts( iterable: Iterable, - predicates: { [P in keyof U]: ((value: T) => boolean) } + predicates: { [P in keyof U]: (value: T) => boolean } ): { [P in keyof U]: number } { const keys = Object.keys(predicates) as (keyof U)[]; const amounts = mapObjectValues(predicates, () => 0);