Skip to content

Commit

Permalink
Merge branch 'release/v2.5.0' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
agolybev committed Apr 26, 2024
2 parents ac64b56 + 9b1640f commit e41c125
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 25 deletions.
13 changes: 5 additions & 8 deletions .github/workflows/build_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand All @@ -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" {} ';'
Expand All @@ -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 <[email protected]>" \
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/storybook-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: storybook build/publish

on:
push:
branches:
- develop
branches:
- develop
paths:
- 'public/**'
- 'packages/components/**'
- "public/**"
- "packages/shared/**"

jobs:
build:
Expand All @@ -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:
Expand All @@ -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 }}
2 changes: 1 addition & 1 deletion buildtools
Submodule buildtools updated 115 files
2 changes: 1 addition & 1 deletion client
Submodule client updated 4627 files
2 changes: 1 addition & 1 deletion server
Submodule server updated 2413 files

0 comments on commit e41c125

Please sign in to comment.