diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 38f75c481..6d1f7a8c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -190,6 +190,30 @@ pages: services: - docker:stable-dind cache: {} + tags: + - "privileged" + +build-docker-main: + <<: *docker + rules: + - if: '$CI_PROJECT_NAMESPACE != "framasoft"' + when: never + - if: '$CI_PIPELINE_SOURCE == "schedule"' + before_script: + # Login to DockerHub + - mkdir -p ~/.docker + - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$CI_REGISTRY_AUTH\",\"email\":\"$CI_REGISTRY_EMAIL\"}}}" > ~/.docker/config.json + script: + - docker build -t framasoft/mobilizon:main -f docker/production/Dockerfile . + - docker push framasoft/mobilizon:main + +build-docker-tag: + <<: *docker + rules: &tag-rules + - if: '$CI_PROJECT_NAMESPACE != "framasoft"' + when: never + - if: $CI_COMMIT_TAG + timeout: 3 hours before_script: # Install buildx - wget https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-amd64 @@ -210,29 +234,9 @@ pages: docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm - -t $DOCKER_IMAGE_NAME + -t framasoft/mobilizon:$CI_COMMIT_TAG + -t framasoft/mobilizon:latest -f docker/production/Dockerfile . - tags: - - "privileged" - timeout: 3 hours - -build-docker-main: - <<: *docker - rules: - - if: '$CI_PROJECT_NAMESPACE != "framasoft"' - when: never - - if: '$CI_PIPELINE_SOURCE == "schedule"' - variables: - DOCKER_IMAGE_NAME: framasoft/mobilizon:main - -build-docker-tag: - <<: *docker - rules: &tag-rules - - if: '$CI_PROJECT_NAMESPACE != "framasoft"' - when: never - - if: $CI_COMMIT_TAG - variables: - DOCKER_IMAGE_NAME: framasoft/mobilizon:$CI_COMMIT_TAG # Packaging app for amd64 package-app: diff --git a/UPGRADE.md b/UPGRADE.md index 9e243afbd..ffb90d7f7 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -34,7 +34,7 @@ In order to keep the release tarballs light, the geographic timezone data is not sudo -u mobilizon curl -L 'https://packages.joinmobilizon.org/tz_world/timezones-geodata.dets' -o /var/lib/mobilizon/timezones/timezones-geodata.dets ``` -In both cases, ~700Mio of disk will be used. You may use the following configuration to specify where the data is expected: +In both cases, ~700Mio of disk will be used. You may use the following configuration to specify where the data is expected if you decide to change it from the default location (`/var/lib/mobilizon/timezones`) : ```elixir config :tz_world, data_dir: "/some/place" ``` diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile index 2a55efba9..41d64d601 100644 --- a/docker/production/Dockerfile +++ b/docker/production/Dockerfile @@ -30,7 +30,8 @@ COPY rel ./rel COPY support ./support COPY --from=assets ./priv/static ./priv/static -RUN mix phx.digest.clean --all \ +RUN mix tz_world.update \ + && mix phx.digest.clean --all \ && mix release # Finally setup the app diff --git a/js/.eslintrc.js b/js/.eslintrc.js index 5d4700196..10dcd95e4 100644 --- a/js/.eslintrc.js +++ b/js/.eslintrc.js @@ -29,7 +29,6 @@ module.exports = { }, ], "@typescript-eslint/no-explicit-any": "off", - "cypress/no-unnecessary-waiting": "off", "vue/max-len": [ "off", { diff --git a/js/.prettierrc.json b/js/.prettierrc.json index 0967ef424..1b2993aa5 100644 --- a/js/.prettierrc.json +++ b/js/.prettierrc.json @@ -1 +1,6 @@ -{} +{ + "trailingComma": "es5", + "semi": true, + "singleQuote": false, + "bracketSpacing": true +} diff --git a/js/package.json b/js/package.json index 20f5494b2..428eff1a9 100644 --- a/js/package.json +++ b/js/package.json @@ -17,17 +17,25 @@ "@apollo/client": "^3.3.16", "@mdi/font": "^6.1.95", "@tiptap/core": "^2.0.0-beta.41", - "@tiptap/extension-blockquote": "^2.0.0-beta.6", + "@tiptap/extension-blockquote": "^2.0.0-beta.25", + "@tiptap/extension-bold": "^2.0.0-beta.24", "@tiptap/extension-bubble-menu": "^2.0.0-beta.9", - "@tiptap/extension-character-count": "^2.0.0-beta.5", - "@tiptap/extension-history": "^2.0.0-beta.5", + "@tiptap/extension-bullet-list": "^2.0.0-beta.23", + "@tiptap/extension-document": "^2.0.0-beta.15", + "@tiptap/extension-dropcursor": "^2.0.0-beta.25", + "@tiptap/extension-gapcursor": "^2.0.0-beta.33", + "@tiptap/extension-heading": "^2.0.0-beta.23", + "@tiptap/extension-history": "^2.0.0-beta.21", "@tiptap/extension-image": "^2.0.0-beta.6", + "@tiptap/extension-italic": "^2.0.0-beta.24", "@tiptap/extension-link": "^2.0.0-beta.8", - "@tiptap/extension-list-item": "^2.0.0-beta.6", + "@tiptap/extension-list-item": "^2.0.0-beta.19", "@tiptap/extension-mention": "^2.0.0-beta.42", - "@tiptap/extension-ordered-list": "^2.0.0-beta.6", + "@tiptap/extension-ordered-list": "^2.0.0-beta.24", + "@tiptap/extension-paragraph": "^2.0.0-beta.22", + "@tiptap/extension-strike": "^2.0.0-beta.26", + "@tiptap/extension-text": "^2.0.0-beta.15", "@tiptap/extension-underline": "^2.0.0-beta.7", - "@tiptap/starter-kit": "^2.0.0-beta.37", "@tiptap/vue-2": "^2.0.0-beta.21", "@vue-a11y/announcer": "^2.1.0", "@vue-a11y/skip-to": "^2.1.2", @@ -78,22 +86,19 @@ "@types/sanitize-html": "^2.5.0", "@typescript-eslint/eslint-plugin": "^5.3.0", "@typescript-eslint/parser": "^5.3.0", - "@vue/cli-plugin-babel": "~5.0.0-rc.0", - "@vue/cli-plugin-e2e-cypress": "~5.0.0-rc.0", - "@vue/cli-plugin-eslint": "~5.0.0-rc.0", - "@vue/cli-plugin-pwa": "~5.0.0-rc.0", - "@vue/cli-plugin-router": "~5.0.0-rc.0", - "@vue/cli-plugin-typescript": "~5.0.0-rc.0", - "@vue/cli-plugin-unit-jest": "~5.0.0-rc.0", - "@vue/cli-service": "~5.0.0-rc.0", + "@vue/cli-plugin-babel": "~5.0.0-rc.1", + "@vue/cli-plugin-eslint": "~5.0.0-rc.1", + "@vue/cli-plugin-pwa": "~5.0.0-rc.1", + "@vue/cli-plugin-router": "~5.0.0-rc.1", + "@vue/cli-plugin-typescript": "~5.0.0-rc.1", + "@vue/cli-plugin-unit-jest": "~5.0.0-rc.1", + "@vue/cli-service": "~5.0.0-rc.1", "@vue/eslint-config-typescript": "^9.0.0", "@vue/test-utils": "^1.1.0", "@vue/vue2-jest": "^27.0.0-alpha.3", "@vue/vue3-jest": "^27.0.0-alpha.1", - "cypress": "^8.3.0", "eslint": "^8.2.0", "eslint-config-prettier": "^8.3.0", - "eslint-plugin-cypress": "^2.10.3", "eslint-plugin-import": "^2.20.2", "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-vue": "^8.0.3", diff --git a/js/src/components/Editor.vue b/js/src/components/Editor.vue index 6645de3ac..a4628b39e 100644 --- a/js/src/components/Editor.vue +++ b/js/src/components/Editor.vue @@ -195,10 +195,18 @@