From 6053f63bade9dbe7e3df1f06e7f8c0275a79624f Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 12:00:01 +0100 Subject: [PATCH 01/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/github-ci.yml | 6 ++-- .../publish-tom-federation-server.yml | 36 +++++++++++++++++++ .github/workflows/publish-tom-server.yml | 0 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/publish-tom-federation-server.yml create mode 100644 .github/workflows/publish-tom-server.yml diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml index f5ab0a2e4..8e0fbd6b1 100644 --- a/.github/workflows/github-ci.yml +++ b/.github/workflows/github-ci.yml @@ -5,9 +5,9 @@ name: Node.js CI on: push: - branches: [ "master" ] + branches: [ "tom-builds" ] pull_request: - branches: [ "master" ] + branches: [ "tom-builds" ] jobs: build: @@ -53,7 +53,7 @@ jobs: with: files: packages/matrix-invite/**/* - name: Build and publish matrix-invite docker image - if: steps.changed-files.outputs.test_any_changed == 'true' + if: steps.changed-files.outputs.any_changed == 'true' uses: philips-software/docker-ci-scripts@v5.1.0 with: base-dir: "${{ github.workspace }}/packages/matrix-invite/" diff --git a/.github/workflows/publish-tom-federation-server.yml b/.github/workflows/publish-tom-federation-server.yml new file mode 100644 index 000000000..7b80162da --- /dev/null +++ b/.github/workflows/publish-tom-federation-server.yml @@ -0,0 +1,36 @@ +# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs + +name: Publish ToM Federation Server + +on: + push: + branches: [ "tom-builds" ] + pull_request: + branches: [ "tom-builds" ] + +jobs: + publish-docker: + runs-on: ubuntu-latest + needs: test + if: github.event_name == 'push' + steps: + - uses: actions/checkout@v3 + - name: Get all src files that have changed + id: changed-files + uses: tj-actions/changed-files@v41 + with: + files: packages/federation-server/**/* + - name: Build and publish matrix-invite docker image + if: steps.changed-files.outputs.any_changed == 'true' + uses: philips-software/docker-ci-scripts@v5.1.0 + with: + base-dir: "${{ github.workspace }}/packages/federation-server/" + dockerfile: "${{ github.workspace }}/packages/federation-server/Dockerfile" + image-name: "tom-federation-server" + tags: "latest" + env: + REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USER }} + REGISTRY_TOKEN: "${{ secrets.DOCKERHUB_PASSWORD }}" + DOCKER_ORGANIZATION: linagora + diff --git a/.github/workflows/publish-tom-server.yml b/.github/workflows/publish-tom-server.yml new file mode 100644 index 000000000..e69de29bb From b129fb03be94c2d53c16a78d96c0d58c33ca2026 Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 12:07:54 +0100 Subject: [PATCH 02/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish-tom-federation-server.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/publish-tom-federation-server.yml b/.github/workflows/publish-tom-federation-server.yml index 7b80162da..32ec31419 100644 --- a/.github/workflows/publish-tom-federation-server.yml +++ b/.github/workflows/publish-tom-federation-server.yml @@ -8,6 +8,11 @@ on: branches: [ "tom-builds" ] pull_request: branches: [ "tom-builds" ] + workflow_run: + workflows: [ "Node.js CI" ] + branches: [ "tom-builds" ] + types: + - completed jobs: publish-docker: From 18cbf7ee6e190d2a6324eb1d75c98f4781e40965 Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 12:08:32 +0100 Subject: [PATCH 03/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish-tom-federation-server.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/publish-tom-federation-server.yml b/.github/workflows/publish-tom-federation-server.yml index 32ec31419..9d376dfc6 100644 --- a/.github/workflows/publish-tom-federation-server.yml +++ b/.github/workflows/publish-tom-federation-server.yml @@ -17,7 +17,6 @@ on: jobs: publish-docker: runs-on: ubuntu-latest - needs: test if: github.event_name == 'push' steps: - uses: actions/checkout@v3 From f8bfe9c8007bc08271bc2055437197e977f26045 Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 12:11:34 +0100 Subject: [PATCH 04/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish-tom-federation-server.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-tom-federation-server.yml b/.github/workflows/publish-tom-federation-server.yml index 9d376dfc6..958a5debb 100644 --- a/.github/workflows/publish-tom-federation-server.yml +++ b/.github/workflows/publish-tom-federation-server.yml @@ -24,7 +24,10 @@ jobs: id: changed-files uses: tj-actions/changed-files@v41 with: - files: packages/federation-server/**/* + files: | + packages/federation-server/**/* + .github/workflows/** + - name: Build and publish matrix-invite docker image if: steps.changed-files.outputs.any_changed == 'true' uses: philips-software/docker-ci-scripts@v5.1.0 From b16fb45a1be40bcf7739a94baee97170f3f50e77 Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 12:20:39 +0100 Subject: [PATCH 05/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/github-ci.yml | 65 +----------------- .github/workflows/publish-matrix-invite.yml | 76 +++++++++++++++++++++ .github/workflows/update-docs.yml | 0 3 files changed, 77 insertions(+), 64 deletions(-) create mode 100644 .github/workflows/publish-matrix-invite.yml create mode 100644 .github/workflows/update-docs.yml diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml index 8e0fbd6b1..9e293abb5 100644 --- a/.github/workflows/github-ci.yml +++ b/.github/workflows/github-ci.yml @@ -39,67 +39,4 @@ jobs: - name: Install playwright test browsers run: npx playwright install - name: Run all tests - run: npm test - - publish-docker: - runs-on: ubuntu-latest - needs: test - if: github.event_name == 'push' - steps: - - uses: actions/checkout@v3 - - name: Get all src files that have changed - id: changed-files - uses: tj-actions/changed-files@v41 - with: - files: packages/matrix-invite/**/* - - name: Build and publish matrix-invite docker image - if: steps.changed-files.outputs.any_changed == 'true' - uses: philips-software/docker-ci-scripts@v5.1.0 - with: - base-dir: "${{ github.workspace }}/packages/matrix-invite/" - dockerfile: "${{ github.workspace }}/packages/matrix-invite/Dockerfile" - image-name: "twake-matrix-invite" - tags: "latest" - env: - REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USER }} - REGISTRY_TOKEN: "${{ secrets.DOCKERHUB_PASSWORD }}" - DOCKER_ORGANIZATION: twaketech - - update-doc: - runs-on: ubuntu-latest - needs: test - if: github.event_name == 'pull_request' - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.ref }} - - name: Set up Node LTS - uses: actions/setup-node@v3 - with: - node-version: lts/* - - name: Install dependencies - run: npm ci - - name: Generate Swagger documentation - run: npm run doc - - name: Check if documentation files has changed - id: verify-changed-files - uses: tj-actions/verify-changed-files@v17 - with: - files: docs/openapi.json - - name: Update documentation files - if: steps.verify-changed-files.outputs.files_changed == 'true' - env: - SPEC_TO_DISPLAY: "openapi.json" - DISABLE_TRY_IT_OUT_JS_METHOD: "const DisableTryItOutPlugin = function() {return {statePlugins:{spec:{wrapSelectors:{allowTryItOutFor:() => () => false}}}}}" - DISABLE_TRY_IT_OUT_PLUGIN: ", DisableTryItOutPlugin" - run: | - yes | cp -rf node_modules/swagger-ui-dist/* docs - sed -i "/window\.onload\s=\sfunction()\s{/a $DISABLE_TRY_IT_OUT_JS_METHOD" docs/swagger-initializer.js - sed -i "s#https://petstore\.swagger\.io/v2/swagger\.json#$SPEC_TO_DISPLAY#g" docs/swagger-initializer.js - sed -i "/SwaggerUIBundle\.plugins\.DownloadUrl/a $DISABLE_TRY_IT_OUT_PLUGIN" docs/swagger-initializer.js - - name: Commit updated documentation files - if: steps.verify-changed-files.outputs.files_changed == 'true' - uses: EndBug/add-and-commit@v9 - with: - add: docs - message: 'chore: update documentation' \ No newline at end of file + run: npm test \ No newline at end of file diff --git a/.github/workflows/publish-matrix-invite.yml b/.github/workflows/publish-matrix-invite.yml new file mode 100644 index 000000000..5620a16bd --- /dev/null +++ b/.github/workflows/publish-matrix-invite.yml @@ -0,0 +1,76 @@ +# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs + +name: Node.js CI + +on: + workflow_run: + workflows: [Node.js CI] + types: + - completed + +jobs: + tests: + uses: ./.github/workflows/tests.yml + publish-docker: + runs-on: ubuntu-latest + needs: test + if: github.event_name == 'push' + steps: + - uses: actions/checkout@v3 + - name: Get all src files that have changed + id: changed-files + uses: tj-actions/changed-files@v41 + with: + files: packages/matrix-invite/**/* + - name: Build and publish matrix-invite docker image + if: steps.changed-files.outputs.any_changed == 'true' + uses: philips-software/docker-ci-scripts@v5.1.0 + with: + base-dir: "${{ github.workspace }}/packages/matrix-invite/" + dockerfile: "${{ github.workspace }}/packages/matrix-invite/Dockerfile" + image-name: "twake-matrix-invite" + tags: "latest" + env: + REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USER }} + REGISTRY_TOKEN: "${{ secrets.DOCKERHUB_PASSWORD }}" + DOCKER_ORGANIZATION: twaketech + + update-doc: + runs-on: ubuntu-latest + needs: test + if: github.event_name == 'pull_request' + steps: + - uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.ref }} + - name: Set up Node LTS + uses: actions/setup-node@v3 + with: + node-version: lts/* + - name: Install dependencies + run: npm ci + - name: Generate Swagger documentation + run: npm run doc + - name: Check if documentation files has changed + id: verify-changed-files + uses: tj-actions/verify-changed-files@v17 + with: + files: docs/openapi.json + - name: Update documentation files + if: steps.verify-changed-files.outputs.files_changed == 'true' + env: + SPEC_TO_DISPLAY: "openapi.json" + DISABLE_TRY_IT_OUT_JS_METHOD: "const DisableTryItOutPlugin = function() {return {statePlugins:{spec:{wrapSelectors:{allowTryItOutFor:() => () => false}}}}}" + DISABLE_TRY_IT_OUT_PLUGIN: ", DisableTryItOutPlugin" + run: | + yes | cp -rf node_modules/swagger-ui-dist/* docs + sed -i "/window\.onload\s=\sfunction()\s{/a $DISABLE_TRY_IT_OUT_JS_METHOD" docs/swagger-initializer.js + sed -i "s#https://petstore\.swagger\.io/v2/swagger\.json#$SPEC_TO_DISPLAY#g" docs/swagger-initializer.js + sed -i "/SwaggerUIBundle\.plugins\.DownloadUrl/a $DISABLE_TRY_IT_OUT_PLUGIN" docs/swagger-initializer.js + - name: Commit updated documentation files + if: steps.verify-changed-files.outputs.files_changed == 'true' + uses: EndBug/add-and-commit@v9 + with: + add: docs + message: 'chore: update documentation' \ No newline at end of file diff --git a/.github/workflows/update-docs.yml b/.github/workflows/update-docs.yml new file mode 100644 index 000000000..e69de29bb From b98ff0403f21cf7a7cd4e761ff1b5f536183c54f Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 12:22:12 +0100 Subject: [PATCH 06/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish-matrix-invite.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-matrix-invite.yml b/.github/workflows/publish-matrix-invite.yml index 5620a16bd..38a998799 100644 --- a/.github/workflows/publish-matrix-invite.yml +++ b/.github/workflows/publish-matrix-invite.yml @@ -1,7 +1,7 @@ # This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs -name: Node.js CI +name: publish-matrix-invite on: workflow_run: From 0d03db3423590ec010a13204874825b2f5ec3053 Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 12:23:54 +0100 Subject: [PATCH 07/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/{github-ci.yml => build-and-test.yml} | 2 +- .github/workflows/publish-matrix-invite.yml | 2 +- .github/workflows/publish-tom-federation-server.yml | 9 ++------- 3 files changed, 4 insertions(+), 9 deletions(-) rename .github/workflows/{github-ci.yml => build-and-test.yml} (98%) diff --git a/.github/workflows/github-ci.yml b/.github/workflows/build-and-test.yml similarity index 98% rename from .github/workflows/github-ci.yml rename to .github/workflows/build-and-test.yml index 9e293abb5..7fcce6f7a 100644 --- a/.github/workflows/github-ci.yml +++ b/.github/workflows/build-and-test.yml @@ -1,7 +1,7 @@ # This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs -name: Node.js CI +name: build-and-test on: push: diff --git a/.github/workflows/publish-matrix-invite.yml b/.github/workflows/publish-matrix-invite.yml index 38a998799..b39eecb48 100644 --- a/.github/workflows/publish-matrix-invite.yml +++ b/.github/workflows/publish-matrix-invite.yml @@ -5,7 +5,7 @@ name: publish-matrix-invite on: workflow_run: - workflows: [Node.js CI] + workflows: [build-and-test] types: - completed diff --git a/.github/workflows/publish-tom-federation-server.yml b/.github/workflows/publish-tom-federation-server.yml index 958a5debb..425a9cbde 100644 --- a/.github/workflows/publish-tom-federation-server.yml +++ b/.github/workflows/publish-tom-federation-server.yml @@ -1,16 +1,11 @@ # This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs -name: Publish ToM Federation Server +name: publish-tom-federation-server on: - push: - branches: [ "tom-builds" ] - pull_request: - branches: [ "tom-builds" ] workflow_run: - workflows: [ "Node.js CI" ] - branches: [ "tom-builds" ] + workflows: [build-and-test] types: - completed From 85207300f4708750dfe7ee897b4e9569835e4fe9 Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 12:26:35 +0100 Subject: [PATCH 08/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish-matrix-invite.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-matrix-invite.yml b/.github/workflows/publish-matrix-invite.yml index b39eecb48..dc93b3e2a 100644 --- a/.github/workflows/publish-matrix-invite.yml +++ b/.github/workflows/publish-matrix-invite.yml @@ -22,7 +22,9 @@ jobs: id: changed-files uses: tj-actions/changed-files@v41 with: - files: packages/matrix-invite/**/* + files: | + packages/federation-server/**/* + .github/workflows/** - name: Build and publish matrix-invite docker image if: steps.changed-files.outputs.any_changed == 'true' uses: philips-software/docker-ci-scripts@v5.1.0 From c14d362620407769cb1855f5813919931440115e Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 12:28:37 +0100 Subject: [PATCH 09/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/update-docs.yml | 47 +++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/.github/workflows/update-docs.yml b/.github/workflows/update-docs.yml index e69de29bb..77e287bdc 100644 --- a/.github/workflows/update-docs.yml +++ b/.github/workflows/update-docs.yml @@ -0,0 +1,47 @@ +name: update-docs + +on: + workflow_run: + workflows: [build-and-test] + types: + - completed + +jobs: + update-doc: + runs-on: ubuntu-latest + needs: test + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} + steps: + - uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.ref }} + - name: Set up Node LTS + uses: actions/setup-node@v3 + with: + node-version: lts/* + - name: Install dependencies + run: npm ci + - name: Generate Swagger documentation + run: npm run doc + - name: Check if documentation files has changed + id: verify-changed-files + uses: tj-actions/verify-changed-files@v17 + with: + files: docs/openapi.json + - name: Update documentation files + if: steps.verify-changed-files.outputs.files_changed == 'true' + env: + SPEC_TO_DISPLAY: "openapi.json" + DISABLE_TRY_IT_OUT_JS_METHOD: "const DisableTryItOutPlugin = function() {return {statePlugins:{spec:{wrapSelectors:{allowTryItOutFor:() => () => false}}}}}" + DISABLE_TRY_IT_OUT_PLUGIN: ", DisableTryItOutPlugin" + run: | + yes | cp -rf node_modules/swagger-ui-dist/* docs + sed -i "/window\.onload\s=\sfunction()\s{/a $DISABLE_TRY_IT_OUT_JS_METHOD" docs/swagger-initializer.js + sed -i "s#https://petstore\.swagger\.io/v2/swagger\.json#$SPEC_TO_DISPLAY#g" docs/swagger-initializer.js + sed -i "/SwaggerUIBundle\.plugins\.DownloadUrl/a $DISABLE_TRY_IT_OUT_PLUGIN" docs/swagger-initializer.js + - name: Commit updated documentation files + if: steps.verify-changed-files.outputs.files_changed == 'true' + uses: EndBug/add-and-commit@v9 + with: + add: docs + message: 'chore: update documentation' \ No newline at end of file From 0bd0a3aee4a599121ca1e6fff63baab6a10ef63d Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 13:43:36 +0100 Subject: [PATCH 10/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../publish-tom-federation-server.yml | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/publish-tom-federation-server.yml b/.github/workflows/publish-tom-federation-server.yml index 425a9cbde..946f5c7ea 100644 --- a/.github/workflows/publish-tom-federation-server.yml +++ b/.github/workflows/publish-tom-federation-server.yml @@ -22,17 +22,13 @@ jobs: files: | packages/federation-server/**/* .github/workflows/** - - - name: Build and publish matrix-invite docker image - if: steps.changed-files.outputs.any_changed == 'true' - uses: philips-software/docker-ci-scripts@v5.1.0 + - name: Publish to dockerhub + uses: elgohr/Publish-Docker-Github-Action@v5 with: - base-dir: "${{ github.workspace }}/packages/federation-server/" - dockerfile: "${{ github.workspace }}/packages/federation-server/Dockerfile" - image-name: "tom-federation-server" + name: linagora/tom-federation-server + username: ${{ secrets.DOCKERHUB_USER }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + workdir: "${{ github.workspace }}/packages/federation-server/" + context: . + buildoptions: "-t linagora/tom-federation-server -f packages/federation-server/Dockerfile" tags: "latest" - env: - REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USER }} - REGISTRY_TOKEN: "${{ secrets.DOCKERHUB_PASSWORD }}" - DOCKER_ORGANIZATION: linagora - From 282fbd32cdfd55e5336b4c501a783211b1623d9d Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 13:48:27 +0100 Subject: [PATCH 11/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish-tom-federation-server.yml | 1 + .github/workflows/publish-tom-server.yml | 0 2 files changed, 1 insertion(+) delete mode 100644 .github/workflows/publish-tom-server.yml diff --git a/.github/workflows/publish-tom-federation-server.yml b/.github/workflows/publish-tom-federation-server.yml index 946f5c7ea..975c07053 100644 --- a/.github/workflows/publish-tom-federation-server.yml +++ b/.github/workflows/publish-tom-federation-server.yml @@ -5,6 +5,7 @@ name: publish-tom-federation-server on: workflow_run: + branches: [ "tom-builds" ] workflows: [build-and-test] types: - completed diff --git a/.github/workflows/publish-tom-server.yml b/.github/workflows/publish-tom-server.yml deleted file mode 100644 index e69de29bb..000000000 From 2138f8e94d011f8888122519578fd054b698c66c Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 14:05:51 +0100 Subject: [PATCH 12/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-and-test.yml | 5 +---- .github/workflows/pr.yml | 14 ++++++++++++++ .github/workflows/push.yml | 9 +++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/pr.yml create mode 100644 .github/workflows/push.yml diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 7fcce6f7a..066512546 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -4,10 +4,7 @@ name: build-and-test on: - push: - branches: [ "tom-builds" ] - pull_request: - branches: [ "tom-builds" ] + workflow_call: jobs: build: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml new file mode 100644 index 000000000..d0a75ac4d --- /dev/null +++ b/.github/workflows/pr.yml @@ -0,0 +1,14 @@ +name: pr + +on: + pull_request_target: + branches: + - tom-builds + merge_group: + workflow_dispatch: + +jobs: + test: + name: Build And Test + uses: ./.github/workflows/build-and-test.yml + secrets: inherit diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml new file mode 100644 index 000000000..af9cdd0d6 --- /dev/null +++ b/.github/workflows/push.yml @@ -0,0 +1,9 @@ +on: + push: + branches: [ "tom-builds" ] + +jobs: + test: + name: Build And Test + uses: ./.github/workflows/build-and-test.yml + secrets: inherit \ No newline at end of file From ec547760489285a6fc2c467f1a132aab7397e394 Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 14:08:16 +0100 Subject: [PATCH 13/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish-tom-federation-server.yml | 6 +----- .github/workflows/push.yml | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish-tom-federation-server.yml b/.github/workflows/publish-tom-federation-server.yml index 975c07053..a03c839f5 100644 --- a/.github/workflows/publish-tom-federation-server.yml +++ b/.github/workflows/publish-tom-federation-server.yml @@ -4,11 +4,7 @@ name: publish-tom-federation-server on: - workflow_run: - branches: [ "tom-builds" ] - workflows: [build-and-test] - types: - - completed + workflow_call: jobs: publish-docker: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index af9cdd0d6..386ae1054 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -6,4 +6,8 @@ jobs: test: name: Build And Test uses: ./.github/workflows/build-and-test.yml + secrets: inherit + publish: + name: Publish Federation Server + uses: ./.github/workflows/publish-tom-federation-server.yml secrets: inherit \ No newline at end of file From 29e73cf7c33a3ace132da6e36bcd5d99deb89ff0 Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 14:14:30 +0100 Subject: [PATCH 14/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish-tom-federation-server.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-tom-federation-server.yml b/.github/workflows/publish-tom-federation-server.yml index a03c839f5..b7a8dade5 100644 --- a/.github/workflows/publish-tom-federation-server.yml +++ b/.github/workflows/publish-tom-federation-server.yml @@ -27,5 +27,5 @@ jobs: password: ${{ secrets.DOCKERHUB_PASSWORD }} workdir: "${{ github.workspace }}/packages/federation-server/" context: . - buildoptions: "-t linagora/tom-federation-server -f packages/federation-server/Dockerfile" + buildoptions: "-t linagora/tom-federation-server -f Dockerfile" tags: "latest" From 7ac300486f478aeecb7346425fa857cb6bd19da3 Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 14:24:03 +0100 Subject: [PATCH 15/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish-tom-federation-server.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-tom-federation-server.yml b/.github/workflows/publish-tom-federation-server.yml index b7a8dade5..ed4bfa024 100644 --- a/.github/workflows/publish-tom-federation-server.yml +++ b/.github/workflows/publish-tom-federation-server.yml @@ -25,7 +25,7 @@ jobs: name: linagora/tom-federation-server username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - workdir: "${{ github.workspace }}/packages/federation-server/" + workdir: "${{ github.workspace }}" context: . - buildoptions: "-t linagora/tom-federation-server -f Dockerfile" + buildoptions: "-t linagora/tom-federation-server -f packages/federation-server/Dockerfile" tags: "latest" From 88d5e8197d240bc24495217f1f0c6d053c14b173 Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 14:42:23 +0100 Subject: [PATCH 16/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr.yml | 2 +- .github/workflows/publish-matrix-invite.yml | 61 +++------------------ .github/workflows/publish-tom-server.yml | 31 +++++++++++ .github/workflows/push.yml | 14 ++++- .github/workflows/update-docs.yml | 5 +- 5 files changed, 55 insertions(+), 58 deletions(-) create mode 100644 .github/workflows/publish-tom-server.yml diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d0a75ac4d..4a18f6ff0 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -3,7 +3,7 @@ name: pr on: pull_request_target: branches: - - tom-builds + - main merge_group: workflow_dispatch: diff --git a/.github/workflows/publish-matrix-invite.yml b/.github/workflows/publish-matrix-invite.yml index dc93b3e2a..495163140 100644 --- a/.github/workflows/publish-matrix-invite.yml +++ b/.github/workflows/publish-matrix-invite.yml @@ -4,10 +4,7 @@ name: publish-matrix-invite on: - workflow_run: - workflows: [build-and-test] - types: - - completed + workflow_call: jobs: tests: @@ -25,54 +22,14 @@ jobs: files: | packages/federation-server/**/* .github/workflows/** - - name: Build and publish matrix-invite docker image - if: steps.changed-files.outputs.any_changed == 'true' - uses: philips-software/docker-ci-scripts@v5.1.0 + - name: Publish to dockerhub + uses: elgohr/Publish-Docker-Github-Action@v5 with: - base-dir: "${{ github.workspace }}/packages/matrix-invite/" - dockerfile: "${{ github.workspace }}/packages/matrix-invite/Dockerfile" - image-name: "twake-matrix-invite" + name: linagora/tom-federation-server + username: ${{ secrets.DOCKERHUB_USER }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + workdir: "${{ github.workspace }}/packages/matrix-invite/" + context: . + buildoptions: "-t linagora/twake-matrix-invite" -f Dockerfile tags: "latest" - env: - REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USER }} - REGISTRY_TOKEN: "${{ secrets.DOCKERHUB_PASSWORD }}" - DOCKER_ORGANIZATION: twaketech - update-doc: - runs-on: ubuntu-latest - needs: test - if: github.event_name == 'pull_request' - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.ref }} - - name: Set up Node LTS - uses: actions/setup-node@v3 - with: - node-version: lts/* - - name: Install dependencies - run: npm ci - - name: Generate Swagger documentation - run: npm run doc - - name: Check if documentation files has changed - id: verify-changed-files - uses: tj-actions/verify-changed-files@v17 - with: - files: docs/openapi.json - - name: Update documentation files - if: steps.verify-changed-files.outputs.files_changed == 'true' - env: - SPEC_TO_DISPLAY: "openapi.json" - DISABLE_TRY_IT_OUT_JS_METHOD: "const DisableTryItOutPlugin = function() {return {statePlugins:{spec:{wrapSelectors:{allowTryItOutFor:() => () => false}}}}}" - DISABLE_TRY_IT_OUT_PLUGIN: ", DisableTryItOutPlugin" - run: | - yes | cp -rf node_modules/swagger-ui-dist/* docs - sed -i "/window\.onload\s=\sfunction()\s{/a $DISABLE_TRY_IT_OUT_JS_METHOD" docs/swagger-initializer.js - sed -i "s#https://petstore\.swagger\.io/v2/swagger\.json#$SPEC_TO_DISPLAY#g" docs/swagger-initializer.js - sed -i "/SwaggerUIBundle\.plugins\.DownloadUrl/a $DISABLE_TRY_IT_OUT_PLUGIN" docs/swagger-initializer.js - - name: Commit updated documentation files - if: steps.verify-changed-files.outputs.files_changed == 'true' - uses: EndBug/add-and-commit@v9 - with: - add: docs - message: 'chore: update documentation' \ No newline at end of file diff --git a/.github/workflows/publish-tom-server.yml b/.github/workflows/publish-tom-server.yml new file mode 100644 index 000000000..69d3442dc --- /dev/null +++ b/.github/workflows/publish-tom-server.yml @@ -0,0 +1,31 @@ +# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs + +name: publish-tom-federation-server + +on: + workflow_call: + +jobs: + publish-docker: + runs-on: ubuntu-latest + if: github.event_name == 'push' + steps: + - uses: actions/checkout@v3 + - name: Get all src files that have changed + id: changed-files + uses: tj-actions/changed-files@v41 + with: + files: | + packages/federation-server/**/* + .github/workflows/** + - name: Publish to dockerhub + uses: elgohr/Publish-Docker-Github-Action@v5 + with: + name: linagora/tom-federation-server + username: ${{ secrets.DOCKERHUB_USER }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + workdir: "${{ github.workspace }}" + context: . + buildoptions: "-t linagora/tom-federation-server -f Dockerfile" + tags: "latest" diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 386ae1054..e65b75d52 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,7 +7,19 @@ jobs: name: Build And Test uses: ./.github/workflows/build-and-test.yml secrets: inherit - publish: + publish-federation-server: name: Publish Federation Server uses: ./.github/workflows/publish-tom-federation-server.yml + secrets: inherit + publish-tom-server: + name: Publish ToM Server + uses: ./.github/workflows/publish-tom--server.yml + secrets: inherit + publish-matrix-invite: + name: Publish Matrix Invite + uses: ./.github/workflows/publish-matrix-invite.yml + secrets: inherit + upadte-docs: + name: Update Docs + uses: ./.github/workflows/update-docs.yml secrets: inherit \ No newline at end of file diff --git a/.github/workflows/update-docs.yml b/.github/workflows/update-docs.yml index 77e287bdc..ab2bb4e27 100644 --- a/.github/workflows/update-docs.yml +++ b/.github/workflows/update-docs.yml @@ -1,10 +1,7 @@ name: update-docs on: - workflow_run: - workflows: [build-and-test] - types: - - completed + workflow_call: jobs: update-doc: From b0f20597a2bde3b29adc9537f7a48cda446d6dde Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 14:43:12 +0100 Subject: [PATCH 17/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index e65b75d52..d90ff5310 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -13,7 +13,7 @@ jobs: secrets: inherit publish-tom-server: name: Publish ToM Server - uses: ./.github/workflows/publish-tom--server.yml + uses: ./.github/workflows/publish-tom-server.yml secrets: inherit publish-matrix-invite: name: Publish Matrix Invite From 7f5ad9291f7b8bb66f350f4011b686b401111f1d Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 14:44:35 +0100 Subject: [PATCH 18/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish-matrix-invite.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/publish-matrix-invite.yml b/.github/workflows/publish-matrix-invite.yml index 495163140..0ecd580a8 100644 --- a/.github/workflows/publish-matrix-invite.yml +++ b/.github/workflows/publish-matrix-invite.yml @@ -7,12 +7,8 @@ on: workflow_call: jobs: - tests: - uses: ./.github/workflows/tests.yml publish-docker: runs-on: ubuntu-latest - needs: test - if: github.event_name == 'push' steps: - uses: actions/checkout@v3 - name: Get all src files that have changed From 852be9525ac8a4bf84d83d35439b5fb6dec15e29 Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 14:47:07 +0100 Subject: [PATCH 19/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish-matrix-invite.yml | 2 +- .github/workflows/publish-tom-federation-server.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/publish-matrix-invite.yml b/.github/workflows/publish-matrix-invite.yml index 0ecd580a8..5e813910c 100644 --- a/.github/workflows/publish-matrix-invite.yml +++ b/.github/workflows/publish-matrix-invite.yml @@ -16,7 +16,7 @@ jobs: uses: tj-actions/changed-files@v41 with: files: | - packages/federation-server/**/* + packages/matrix-invite/**/* .github/workflows/** - name: Publish to dockerhub uses: elgohr/Publish-Docker-Github-Action@v5 diff --git a/.github/workflows/publish-tom-federation-server.yml b/.github/workflows/publish-tom-federation-server.yml index ed4bfa024..15571f8de 100644 --- a/.github/workflows/publish-tom-federation-server.yml +++ b/.github/workflows/publish-tom-federation-server.yml @@ -9,7 +9,6 @@ on: jobs: publish-docker: runs-on: ubuntu-latest - if: github.event_name == 'push' steps: - uses: actions/checkout@v3 - name: Get all src files that have changed From e56df9c0934a26b3af26282506671f492ee1e897 Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 14:50:51 +0100 Subject: [PATCH 20/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish-matrix-invite.yml | 4 ++-- .github/workflows/publish-tom-federation-server.yml | 4 ++-- .github/workflows/publish-tom-server.yml | 9 ++++----- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish-matrix-invite.yml b/.github/workflows/publish-matrix-invite.yml index 5e813910c..7b2293fa8 100644 --- a/.github/workflows/publish-matrix-invite.yml +++ b/.github/workflows/publish-matrix-invite.yml @@ -7,7 +7,7 @@ on: workflow_call: jobs: - publish-docker: + publish: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -21,7 +21,7 @@ jobs: - name: Publish to dockerhub uses: elgohr/Publish-Docker-Github-Action@v5 with: - name: linagora/tom-federation-server + name: linagora/twake-matrix-invite username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_PASSWORD }} workdir: "${{ github.workspace }}/packages/matrix-invite/" diff --git a/.github/workflows/publish-tom-federation-server.yml b/.github/workflows/publish-tom-federation-server.yml index 15571f8de..1611dcf03 100644 --- a/.github/workflows/publish-tom-federation-server.yml +++ b/.github/workflows/publish-tom-federation-server.yml @@ -7,7 +7,7 @@ on: workflow_call: jobs: - publish-docker: + publish: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -15,7 +15,7 @@ jobs: id: changed-files uses: tj-actions/changed-files@v41 with: - files: | + files: | packages/federation-server/**/* .github/workflows/** - name: Publish to dockerhub diff --git a/.github/workflows/publish-tom-server.yml b/.github/workflows/publish-tom-server.yml index 69d3442dc..c386e0c30 100644 --- a/.github/workflows/publish-tom-server.yml +++ b/.github/workflows/publish-tom-server.yml @@ -7,25 +7,24 @@ on: workflow_call: jobs: - publish-docker: + publish: runs-on: ubuntu-latest - if: github.event_name == 'push' steps: - uses: actions/checkout@v3 - name: Get all src files that have changed id: changed-files uses: tj-actions/changed-files@v41 with: - files: | + files: | packages/federation-server/**/* .github/workflows/** - name: Publish to dockerhub uses: elgohr/Publish-Docker-Github-Action@v5 with: - name: linagora/tom-federation-server + name: linagora/tom-server username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_PASSWORD }} workdir: "${{ github.workspace }}" context: . - buildoptions: "-t linagora/tom-federation-server -f Dockerfile" + buildoptions: "-t linagora/tom-server -f Dockerfile" tags: "latest" From ba7b2b3d7e59077b860137c71a91b1d9f9c3bc07 Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 14:51:43 +0100 Subject: [PATCH 21/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish-matrix-invite.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish-matrix-invite.yml b/.github/workflows/publish-matrix-invite.yml index 7b2293fa8..ef74ce70e 100644 --- a/.github/workflows/publish-matrix-invite.yml +++ b/.github/workflows/publish-matrix-invite.yml @@ -18,14 +18,14 @@ jobs: files: | packages/matrix-invite/**/* .github/workflows/** - - name: Publish to dockerhub - uses: elgohr/Publish-Docker-Github-Action@v5 - with: - name: linagora/twake-matrix-invite - username: ${{ secrets.DOCKERHUB_USER }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} - workdir: "${{ github.workspace }}/packages/matrix-invite/" - context: . - buildoptions: "-t linagora/twake-matrix-invite" -f Dockerfile - tags: "latest" +# - name: Publish to dockerhub +# uses: elgohr/Publish-Docker-Github-Action@v5 +# with: +# name: linagora/twake-matrix-invite +# username: ${{ secrets.DOCKERHUB_USER }} +# password: ${{ secrets.DOCKERHUB_PASSWORD }} +# workdir: "${{ github.workspace }}/packages/matrix-invite/" +# context: . +# buildoptions: "-t linagora/twake-matrix-invite" -f Dockerfile +# tags: "latest" From 941722d7c207b05fd2177765e05a1b931d62a55c Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 14:52:52 +0100 Subject: [PATCH 22/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/update-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-docs.yml b/.github/workflows/update-docs.yml index ab2bb4e27..4c2385415 100644 --- a/.github/workflows/update-docs.yml +++ b/.github/workflows/update-docs.yml @@ -4,7 +4,7 @@ on: workflow_call: jobs: - update-doc: + update: runs-on: ubuntu-latest needs: test if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} From 27b0a56968203f3accffafd28fa53e61e25f2bc9 Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 14:53:30 +0100 Subject: [PATCH 23/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/update-docs.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/update-docs.yml b/.github/workflows/update-docs.yml index 4c2385415..9c2c74cce 100644 --- a/.github/workflows/update-docs.yml +++ b/.github/workflows/update-docs.yml @@ -6,8 +6,6 @@ on: jobs: update: runs-on: ubuntu-latest - needs: test - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} steps: - uses: actions/checkout@v3 with: From aa85d9e517b1af80bab20c6911b70002a0f55fe7 Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 14:54:51 +0100 Subject: [PATCH 24/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish-matrix-invite.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish-matrix-invite.yml b/.github/workflows/publish-matrix-invite.yml index ef74ce70e..7b2293fa8 100644 --- a/.github/workflows/publish-matrix-invite.yml +++ b/.github/workflows/publish-matrix-invite.yml @@ -18,14 +18,14 @@ jobs: files: | packages/matrix-invite/**/* .github/workflows/** -# - name: Publish to dockerhub -# uses: elgohr/Publish-Docker-Github-Action@v5 -# with: -# name: linagora/twake-matrix-invite -# username: ${{ secrets.DOCKERHUB_USER }} -# password: ${{ secrets.DOCKERHUB_PASSWORD }} -# workdir: "${{ github.workspace }}/packages/matrix-invite/" -# context: . -# buildoptions: "-t linagora/twake-matrix-invite" -f Dockerfile -# tags: "latest" + - name: Publish to dockerhub + uses: elgohr/Publish-Docker-Github-Action@v5 + with: + name: linagora/twake-matrix-invite + username: ${{ secrets.DOCKERHUB_USER }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + workdir: "${{ github.workspace }}/packages/matrix-invite/" + context: . + buildoptions: "-t linagora/twake-matrix-invite" -f Dockerfile + tags: "latest" From fc1dbeb85baa0fa1c9709ea08c721084db124071 Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 14:59:18 +0100 Subject: [PATCH 25/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish-matrix-invite.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-matrix-invite.yml b/.github/workflows/publish-matrix-invite.yml index 7b2293fa8..6d395990d 100644 --- a/.github/workflows/publish-matrix-invite.yml +++ b/.github/workflows/publish-matrix-invite.yml @@ -21,11 +21,11 @@ jobs: - name: Publish to dockerhub uses: elgohr/Publish-Docker-Github-Action@v5 with: - name: linagora/twake-matrix-invite + name: linagora/tom-server username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - workdir: "${{ github.workspace }}/packages/matrix-invite/" + workdir: "${{ github.workspace }}" context: . - buildoptions: "-t linagora/twake-matrix-invite" -f Dockerfile + buildoptions: "-t linagora/tom-server -f Dockerfile" tags: "latest" From 3954f076d596e5d8c7dc04df2bbaeeaf4a776940 Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 15:00:19 +0100 Subject: [PATCH 26/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish-matrix-invite.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-matrix-invite.yml b/.github/workflows/publish-matrix-invite.yml index 6d395990d..369a8d6a8 100644 --- a/.github/workflows/publish-matrix-invite.yml +++ b/.github/workflows/publish-matrix-invite.yml @@ -21,11 +21,11 @@ jobs: - name: Publish to dockerhub uses: elgohr/Publish-Docker-Github-Action@v5 with: - name: linagora/tom-server + name: linagora/matrix-invite username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - workdir: "${{ github.workspace }}" + workdir: "${{ github.workspace }}/packages/matrix-invite" context: . - buildoptions: "-t linagora/tom-server -f Dockerfile" + buildoptions: "-t linagora/matrix-invite -f Dockerfile" tags: "latest" From fb4a39c833b5115e2e5f73836f6e9a7169f77503 Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 15:01:58 +0100 Subject: [PATCH 27/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/push.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index d90ff5310..6a9ac6cf9 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,6 +1,7 @@ on: push: - branches: [ "tom-builds" ] + branches: + - main jobs: test: From 8ea8eb69e4318581c11c76b86355f68f5d64c51b Mon Sep 17 00:00:00 2001 From: Anton SHEPILOV Date: Wed, 31 Jan 2024 15:02:45 +0100 Subject: [PATCH 28/28] =?UTF-8?q?=F0=9F=90=B3Publish=20docker=20image=20fo?= =?UTF-8?q?r=20federation=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish-tom-server.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-tom-server.yml b/.github/workflows/publish-tom-server.yml index c386e0c30..e1d03efed 100644 --- a/.github/workflows/publish-tom-server.yml +++ b/.github/workflows/publish-tom-server.yml @@ -1,7 +1,7 @@ # This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs -name: publish-tom-federation-server +name: publish-tom-server on: workflow_call: