diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml index 1376eb9f12b..66aff4f7e81 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 }} @@ -72,13 +72,8 @@ 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 - sudo apt install -y dotnet-sdk-7.0 yarn nodejs rename + 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 sudo apt install -y python3-rpm python3-pip @@ -96,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" {} ';' @@ -111,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 " \ 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 }} diff --git a/buildtools b/buildtools index e84bffc11e3..0e55697fb73 160000 --- a/buildtools +++ b/buildtools @@ -1 +1 @@ -Subproject commit e84bffc11e39d55d9031d534ad1b47f9e345c5f1 +Subproject commit 0e55697fb73c751b3eb946d69c02551cf4306a82 diff --git a/client b/client index 6d0411f9b10..4bad4afa86b 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 6d0411f9b106e2520fd96260c423f7993a763f90 +Subproject commit 4bad4afa86b237edd40edba42f3027108535a395 diff --git a/server b/server index 8cbc43416a8..bd4cc355d36 160000 --- a/server +++ b/server @@ -1 +1 @@ -Subproject commit 8cbc43416a825ffa6d3b2705dd1f32633c8209bd +Subproject commit bd4cc355d36358a3e8744d6ef6eee2bc1d6be69a