From b45c74b1adb16892a5aca97d1eaa8f4cad346b2c Mon Sep 17 00:00:00 2001 From: Alexey Safronov Date: Thu, 22 Feb 2024 20:33:47 +0400 Subject: [PATCH 1/6] Fix storybook workflow --- .github/workflows/storybook-publish.yml | 28 ++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/storybook-publish.yml b/.github/workflows/storybook-publish.yml index 17c08e0036d..72a651da383 100644 --- a/.github/workflows/storybook-publish.yml +++ b/.github/workflows/storybook-publish.yml @@ -2,11 +2,11 @@ name: storybook build/publish on: push: - branches: - - develop + branches: + - develop paths: - - 'public/**' - - 'packages/components/**' + - "public/**" + - "packages/shared/**" jobs: build: @@ -17,13 +17,13 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - + - uses: actions/setup-node@v3 with: - node-version: '18.x' + node-version: "20.x" - run: yarn - run: yarn storybook-build - + - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2 with: @@ -32,12 +32,12 @@ jobs: aws-region: ${{ secrets.AWS_REGION }} - name: Upload storybook files - run: | - aws s3 cp ./packages/components/storybook-static/ ${{ secrets.AWS_BUCKER_URL }}/ \ - --recursive - + run: | + aws s3 cp ./packages/shared/storybook-static/ ${{ secrets.AWS_BUCKER_URL }}/ \ + --recursive + - name: Invalidate AWS CLOUDFRONT cache run: | - aws cloudfront create-invalidation \ - -- --paths "/*" \ - --distribution-id ${{ secrets.AWS_DISTRIBUTION_ID }} + aws cloudfront create-invalidation \ + -- --paths "/*" \ + --distribution-id ${{ secrets.AWS_DISTRIBUTION_ID }} From 45011116fe18a3826a4d8d92676f02df29747de8 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Tue, 27 Feb 2024 19:07:49 +0700 Subject: [PATCH 2/6] Update the dotnet version to 8.0 in the packages build action (#1800) --- .github/workflows/build_packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml index 1376eb9f12b..147075c17a7 100644 --- a/.github/workflows/build_packages.yml +++ b/.github/workflows/build_packages.yml @@ -78,7 +78,7 @@ jobs: sudo gpg --no-default-keyring --keyring gnupg-ring:/usr/share/keyrings/nodesource.gpg --import sudo chmod 644 /usr/share/keyrings/nodesource.gpg sudo apt-get -y update - sudo apt install -y dotnet-sdk-7.0 yarn nodejs rename + sudo apt install -y dotnet-sdk-8.0 yarn nodejs rename sudo npm install -g json if [[ "${{ matrix.packageType }}" == "rpm" ]]; then sudo apt install -y python3-rpm python3-pip From f27daf48b24ac6e3f34fe05df70d9f24e7c168ec Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Thu, 4 Apr 2024 18:34:07 +0700 Subject: [PATCH 3/6] Upgrade to a newer version of nodejs --- .github/workflows/build_packages.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml index 147075c17a7..0ffd7d49a70 100644 --- a/.github/workflows/build_packages.yml +++ b/.github/workflows/build_packages.yml @@ -72,12 +72,7 @@ jobs: wget https://packages.microsoft.com/config/$(lsb_release -is | \ tr [:upper:] [:lower:])/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb sudo dpkg -i packages-microsoft-prod.deb - echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | \ - sudo tee /etc/apt/sources.list.d/nodesource.list - wget -O - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | \ - sudo gpg --no-default-keyring --keyring gnupg-ring:/usr/share/keyrings/nodesource.gpg --import - sudo chmod 644 /usr/share/keyrings/nodesource.gpg - sudo apt-get -y update + curl -fsSL https://deb.nodesource.com/setup_20.x | sudo bash - sudo apt install -y dotnet-sdk-8.0 yarn nodejs rename sudo npm install -g json if [[ "${{ matrix.packageType }}" == "rpm" ]]; then From f74c6f2f9160dec17a9e2c7f04e64b9b78a05349 Mon Sep 17 00:00:00 2001 From: Elbakyan Shirak Date: Thu, 29 Feb 2024 16:58:22 +0400 Subject: [PATCH 4/6] Update default version naming --- .github/workflows/build_packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml index 0ffd7d49a70..cc009c26b72 100644 --- a/.github/workflows/build_packages.yml +++ b/.github/workflows/build_packages.yml @@ -23,7 +23,7 @@ concurrency: env: PRODUCT: ${{ github.event.repository.name }} PRODUCT_LOW: echo ${{ github.event.repository.name }} | tr '[:upper:]' '[:lower:]' - PRODUCT_VERSION: echo ${{ github.ref }} | grep -oP '\d+\.\d+\.\d+' || echo '2.0.0' + PRODUCT_VERSION: echo ${{ github.ref }} | grep -oP '\d+\.\d+\.\d+' || echo '2.5.0' BUILD_NUMBER: ${{ github.run_number }} PACKAGE_DIRECTORY: "/home/runner/work/${{ github.event.repository.name }}/${{ github.event.repository.name }}" BRANCH_BUILDTOOLS: ${{ github.event.inputs.branch-buildtools }} From ce1e51359e2d6c803628d1254174a02e3a1e3794 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Mon, 15 Apr 2024 16:25:39 +0700 Subject: [PATCH 5/6] Add static campaings to the package build (#1815) --- .github/workflows/build_packages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml index cc009c26b72..66aff4f7e81 100644 --- a/.github/workflows/build_packages.yml +++ b/.github/workflows/build_packages.yml @@ -91,6 +91,7 @@ jobs: wget -q -O ./debian/source/server.tar.gz "https://github.com/ONLYOFFICE/$PRODUCT-server/archive/${BRANCH_SERVER}.tar.gz" wget -q -O ./debian/source/dictionaries.tar.gz "https://github.com/ONLYOFFICE/dictionaries/archive/master.tar.gz" wget -q -O ./debian/source/DocStore.tar.gz "https://github.com/ONLYOFFICE/document-templates/archive/main/community-server.tar.gz" + wget -q -O ./debian/source/campaigns.tar.gz "https://github.com/ONLYOFFICE/ASC.Web.Campaigns/archive/master.tar.gz" rename -f -v "s/product([^\/]*)$/$(${{ env.PRODUCT_LOW }})\$1/g" debian/* find debian/ -type f -exec sed -i "s/{{product}}/$(${{ env.PRODUCT_LOW }})/g" {} ';' @@ -106,6 +107,7 @@ jobs: wget -q -O ./SOURCES/server.tar.gz "https://github.com/ONLYOFFICE/$PRODUCT-server/archive/${BRANCH_SERVER}.tar.gz" wget -q -O ./SOURCES/dictionaries.tar.gz "https://github.com/ONLYOFFICE/dictionaries/archive/master.tar.gz" wget -q -O ./SOURCES/DocStore.tar.gz "https://github.com/ONLYOFFICE/document-templates/archive/main/community-server.tar.gz" + wget -q -O ./SOURCES/campaigns.tar.gz "https://github.com/ONLYOFFICE/ASC.Web.Campaigns/archive/master.tar.gz" mv ./SOURCES/product.rpmlintrc ./SOURCES/$(${{ env.PRODUCT_LOW }}).rpmlintrc sed -i -e '/BuildRequires/d' product.spec rpmbuild -D "packager Ascensio System SIA " \ From 9b1640f5a291a5a8ee416c10d3855640069ea672 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Fri, 26 Apr 2024 17:13:21 +0300 Subject: [PATCH 6/6] Update submodules --- buildtools | 2 +- client | 2 +- server | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildtools b/buildtools index 5520b2e8f5b..0e55697fb73 160000 --- a/buildtools +++ b/buildtools @@ -1 +1 @@ -Subproject commit 5520b2e8f5b00e569bd06c77c83086dc6e84fa0d +Subproject commit 0e55697fb73c751b3eb946d69c02551cf4306a82 diff --git a/client b/client index e61369d5221..4bad4afa86b 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit e61369d52215f960811c5b8d52c608880c961044 +Subproject commit 4bad4afa86b237edd40edba42f3027108535a395 diff --git a/server b/server index c87994dafc9..bd4cc355d36 160000 --- a/server +++ b/server @@ -1 +1 @@ -Subproject commit c87994dafc9f97e7d56badade607303b83e53c9f +Subproject commit bd4cc355d36358a3e8744d6ef6eee2bc1d6be69a