diff --git a/.github/workflows/artifact-csharp-mvc.yml b/.github/workflows/artifact-csharp-mvc.yml index c333a679..c1f4337c 100644 --- a/.github/workflows/artifact-csharp-mvc.yml +++ b/.github/workflows/artifact-csharp-mvc.yml @@ -21,11 +21,9 @@ jobs: cwd=$(pwd) git submodule update --init --recursive cd ./web/documentserver-example/csharp-mvc - mkdir -p ./deploy/'DotNet (Csharp MVN) Example' + mkdir -p ./deploy/'DotNet (Csharp MVC) Example' rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp MVC) Example' - cd ./deploy/'DotNet (Csharp MVC) Example'/assets - rm -rf ./.git/ - rm .git + rm -rf ./deploy/'DotNet (Csharp MVC) Example'/assets/.git - name: Upload Artifact uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/artifact-csharp.yml b/.github/workflows/artifact-csharp.yml index 04045571..ed83e607 100644 --- a/.github/workflows/artifact-csharp.yml +++ b/.github/workflows/artifact-csharp.yml @@ -18,14 +18,11 @@ jobs: - name: Build Artifact run: | cd ${{ github.workspace }} - cwd=$(pwd) git submodule update --init --recursive cd ./web/documentserver-example/csharp mkdir -p ./deploy/'DotNet (Csharp) Example' rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp) Example' - cd ./deploy/'DotNet (Csharp) Example'/assets - rm -rf ./.git/ - rm .git + rm -rf ./deploy/'DotNet (Csharp) Example'/assets/.git - name: Upload Artifact uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/artifact-java.yml b/.github/workflows/artifact-java.yml index cea169f9..ab8fe55e 100644 --- a/.github/workflows/artifact-java.yml +++ b/.github/workflows/artifact-java.yml @@ -18,14 +18,12 @@ jobs: - name: Build Artifact run: | cd ${{ github.workspace }} - cwd=$(pwd) git submodule update --init --recursive cd ./web/documentserver-example/java mkdir -p ./deploy/'Java Example' rsync -av --exclude='deploy' ./ ./deploy/'Java Example' - cd ./deploy/'Java Example'/src/main/resources/assets - rm -rf ./.git/ - rm .git + rm -rf ./deploy/'Java Example'/src/main/resources/assets/document-formats/.git + rm -rf ./deploy/'Java Example'/src/main/resources/assets/document-templates/.git - name: Upload Artifact uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/artifact-node.yml b/.github/workflows/artifact-node.yml index a6bf809e..d3e3eff7 100644 --- a/.github/workflows/artifact-node.yml +++ b/.github/workflows/artifact-node.yml @@ -18,14 +18,12 @@ jobs: - name: Build Artifact run: | cd ${{ github.workspace }} - cwd=$(pwd) git submodule update --init --recursive cd ./web/documentserver-example/nodejs mkdir -p ./deploy/'Node.js Example' rsync -av --exclude='deploy' ./ ./deploy/'Node.js Example' - cd ./deploy/'Node.js Example'/public/assets - rm -rf ./.git/ - rm .git + rm -rf ./deploy/'Node.js Example'/public/assets/document-formats/.git + rm -rf ./deploy/'Node.js Example'/public/assets/document-templates/.git - name: Upload Artifact uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/artifact-php.yml b/.github/workflows/artifact-php.yml index 4c435db4..0a75e6fe 100644 --- a/.github/workflows/artifact-php.yml +++ b/.github/workflows/artifact-php.yml @@ -18,14 +18,12 @@ jobs: - name: Build Artifact run: | cd ${{ github.workspace }} - cwd=$(pwd) git submodule update --init --recursive cd ./web/documentserver-example/php mkdir -p ./deploy/'PHP Example' rsync -av --exclude='deploy' ./ ./deploy/'PHP Example' - cd ./deploy/'PHP Example'/assets - rm -rf ./.git/ - rm .git + rm -rf ./deploy/'PHP Example'/assets/document-formats/.git + rm -rf ./deploy/'PHP Example'/assets/document-templates/.git - name: Upload Artifact uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/artifact-python.yml b/.github/workflows/artifact-python.yml index be0b878d..ad331892 100644 --- a/.github/workflows/artifact-python.yml +++ b/.github/workflows/artifact-python.yml @@ -18,14 +18,12 @@ jobs: - name: Build Artifact run: | cd ${{ github.workspace }} - cwd=$(pwd) git submodule update --init --recursive cd ./web/documentserver-example/python mkdir -p ./deploy/'Python Example' rsync -av --exclude='deploy' ./ ./deploy/'Python Example' - cd ./deploy/'Python Example'/assets - rm -rf ./.git/ - rm .git + rm -rf ./deploy/'Python Example'/assets/document-formats/.git + rm -rf ./deploy/'Python Example'/assets/document-templates/.git - name: Upload Artifact uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/artifact-ruby.yml b/.github/workflows/artifact-ruby.yml index 2cf3b005..407c4088 100644 --- a/.github/workflows/artifact-ruby.yml +++ b/.github/workflows/artifact-ruby.yml @@ -18,14 +18,12 @@ jobs: - name: Build Artifact run: | cd ${{ github.workspace }} - cwd=$(pwd) git submodule update --init --recursive cd ./web/documentserver-example/ruby mkdir -p ./deploy/'Ruby Example' rsync -av --exclude='deploy' ./ ./deploy/'Ruby Example' - cd ./deploy/'Ruby Example'/public/assets - rm -rf ./.git/ - rm .git + rm -rf ./deploy/'Ruby Example'/public/assets/document-formats/.git + rm -rf ./deploy/'Ruby Example'/public/assets/document-templates/.git - name: Upload Artifact uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/artifact-spring.yml b/.github/workflows/artifact-spring.yml index 0de71f0c..9d2be6c7 100644 --- a/.github/workflows/artifact-spring.yml +++ b/.github/workflows/artifact-spring.yml @@ -23,9 +23,8 @@ jobs: cd ./web/documentserver-example/java-spring mkdir -p ./deploy/'Java Spring Example' rsync -av --exclude='deploy' ./ ./deploy/'Java Spring Example' - cd ./deploy/'Java Spring Example'/src/main/resources/assets - rm -rf ./.git/ - rm .git + rm -rf ./deploy/'Java Spring Example'/src/main/resources/assets/document-formats/.git + rm -rf ./deploy/'Java Spring Example'/src/main/resources/assets/document-templates/.git - name: Upload Artifact uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/lint-python.yml b/.github/workflows/lint-python.yml index 3e290ec6..e323439b 100644 --- a/.github/workflows/lint-python.yml +++ b/.github/workflows/lint-python.yml @@ -32,9 +32,9 @@ jobs: - name: Lint Flake8 run: | - flake8 ./**/*.py --count --select=E9,F63,F7,F82 --show-source --statistics - flake8 ./**/*.py --count --max-complexity=10 --max-line-length=79 --statistics + flake8 --count --select=E9,F63,F7,F82 --show-source --statistics + flake8 --count --max-complexity=10 --max-line-length=79 --statistics - name: Lint Pylint run: | - pylint ./**/*.py + find . -type f -name "*.py" | xargs pylint diff --git a/.github/workflows/lint-ruby.yml b/.github/workflows/lint-ruby.yml index cdb74d23..4b476edf 100644 --- a/.github/workflows/lint-ruby.yml +++ b/.github/workflows/lint-ruby.yml @@ -16,16 +16,22 @@ jobs: run: working-directory: ./web/documentserver-example/ruby steps: - - name: Checkout Repository - uses: actions/checkout@v3 - - uses: ruby/setup-ruby@v1 - with: - ruby-version: '3.0' - bundler-cache: true - - name: Install dependencies - run: | - bundle install - - name: Rubocop - run: | - gem install rubocop - rubocop + - name: Checkout Repository + uses: actions/checkout@v3 + + - name: Setup Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.2.2' + + - name: Update Submodules + run: | + git submodule update --init --recursive + + - name: Install Dependencies + run: | + bundle update + + - name: Rubocop + run: | + bundle exec rubocop diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 74656916..b8518bbd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,8 +13,10 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v3 - - name: Install Zip - run: sudo apt-get install zip + - name: Clone Submodules + run: | + cd ${{ github.workspace }} + git submodule update --init --recursive - name: Get Info run: | echo "version=$(grep -Eo '[0-9]+(\.[0-9]+)+' CHANGELOG.md | head -n 1)" >> $GITHUB_OUTPUT @@ -25,91 +27,66 @@ jobs: - name: Build Csharp MVC Artifact run: | cd ${{ github.workspace }} - cwd=$(pwd) - git submodule update --init --recursive cd ./web/documentserver-example/csharp-mvc mkdir -p ./'DotNet (Csharp MVC) Example' rsync -av --exclude='DotNet (Csharp MVC) Example' ./ ./'DotNet (Csharp MVC) Example' cd ./'DotNet (Csharp MVC) Example'/assets - rm -rf ./.git/ - rm .git + rm -rf .git - name: Build Csharp Artifact run: | cd ${{ github.workspace }} - cwd=$(pwd) - git submodule update --init --recursive cd ./web/documentserver-example/csharp mkdir -p ./'DotNet (Csharp) Example' rsync -av --exclude='DotNet (Csharp) Example' ./ ./'DotNet (Csharp) Example' - cd ./'DotNet (Csharp) Example'/assets - rm -rf ./.git/ - rm .git + rm -rf ./'DotNet (Csharp) Example'/assets/.git - name: Build Java Artifact run: | cd ${{ github.workspace }} - cwd=$(pwd) - git submodule update --init --recursive cd ./web/documentserver-example/java mkdir -p ./'Java Example' rsync -av --exclude='Java Example' ./ ./'Java Example' - cd ./'Java Example'/src/main/resources/assets - rm -rf ./.git/ - rm .git + rm -rf ./'Java Example'/src/main/resources/assets/document-formats/.git + rm -rf ./'Java Example'/src/main/resources/assets/document-templates/.git - name: Build Nodejs Artifact run: | cd ${{ github.workspace }} - cwd=$(pwd) - git submodule update --init --recursive cd ./web/documentserver-example/nodejs mkdir -p ./'Node.js Example' rsync -av --exclude='Node.js Example' ./ ./'Node.js Example' - cd ./'Node.js Example'/public/assets - rm -rf ./.git/ - rm .git + rm -rf ./'Node.js Example'/public/assets/document-formats/.git + rm -rf ./'Node.js Example'/public/assets/document-templates/.git - name: Build PHP Artifact run: | cd ${{ github.workspace }} - cwd=$(pwd) - git submodule update --init --recursive cd ./web/documentserver-example/php mkdir -p ./'PHP Example' rsync -av --exclude='PHP Example' ./ ./'PHP Example' - cd ./'PHP Example'/assets - rm -rf ./.git/ - rm .git + rm -rf ./'PHP Example'/assets/document-formats/.git + rm -rf ./'PHP Example'/assets/document-templates/.git - name: Build Python Artifact run: | cd ${{ github.workspace }} - cwd=$(pwd) - git submodule update --init --recursive cd ./web/documentserver-example/python mkdir -p ./'Python Example' rsync -av --exclude='Python Example' ./ ./'Python Example' - cd ./'Python Example'/assets - rm -rf ./.git/ - rm .git + rm -rf ./'Python Example'/assets/document-formats/.git + rm -rf ./'Python Example'/assets/document-templates/.git - name: Build Ruby Artifact run: | cd ${{ github.workspace }} - cwd=$(pwd) - git submodule update --init --recursive cd ./web/documentserver-example/ruby mkdir -p ./'Ruby Example' rsync -av --exclude='Ruby Example' ./ ./'Ruby Example' - cd ./'Ruby Example'/public/assets - rm -rf ./.git/ - rm .git + rm -rf ./'Ruby Example'/public/assets/document-formats/.git + rm -rf ./'Ruby Example'/public/assets/document-templates/.git - name: Build Spring Artifact run: | cd ${{ github.workspace }} - cwd=$(pwd) - git submodule update --init --recursive cd ./web/documentserver-example/java-spring mkdir -p ./'Java Spring Example' rsync -av --exclude='Java Spring Example' ./ ./'Java Spring Example' - cd ./'Java Spring Example'/src/main/resources/assets - rm -rf ./.git/ - rm .git + rm -rf ./'Java Spring Example'/src/main/resources/assets/document-formats/.git + rm -rf ./'Java Spring Example'/src/main/resources/assets/document-templates/.git - name: Pack Artifacts run: | cd ${{ github.workspace }}/web/documentserver-example/csharp-mvc diff --git a/web/documentserver-example/php/docker-compose.yml b/web/documentserver-example/php/docker-compose.yml index 1b9d75e2..9ff84e3e 100644 --- a/web/documentserver-example/php/docker-compose.yml +++ b/web/documentserver-example/php/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: document-server: container_name: document-server - image: onlyoffice/documentserver:7.3.3.50 + image: onlyoffice/documentserver:7.5 expose: - "80" environment: diff --git a/web/documentserver-example/python/compose-base.yml b/web/documentserver-example/python/compose-base.yml index 867f7041..9731ba86 100644 --- a/web/documentserver-example/python/compose-base.yml +++ b/web/documentserver-example/python/compose-base.yml @@ -3,7 +3,7 @@ version: "3.8" services: document-server: container_name: document-server - image: onlyoffice/documentserver:7.3.3.50 + image: onlyoffice/documentserver:7.5 expose: - "80" environment: diff --git a/web/documentserver-example/ruby/compose-base.yml b/web/documentserver-example/ruby/compose-base.yml index a0957458..f47d7882 100644 --- a/web/documentserver-example/ruby/compose-base.yml +++ b/web/documentserver-example/ruby/compose-base.yml @@ -3,7 +3,7 @@ version: "3.8" services: document-server: container_name: document-server - image: onlyoffice/documentserver:7.3.3.50 + image: onlyoffice/documentserver:7.5 expose: - "80" environment: