From 77849f8d5439b77f1cd378847d4f85d467f3760f Mon Sep 17 00:00:00 2001 From: Rodion Iafarov Date: Thu, 3 Dec 2020 15:47:02 +0100 Subject: [PATCH 1/9] Remove travis yml --- .travis.yml | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c095374eecd7..000000000000 --- a/.travis.yml +++ /dev/null @@ -1,46 +0,0 @@ -language: perl -matrix: - include: - - name: "openSUSE/SUSE production perl version, only compile check" - perl: "5.26" - env: TESTS=compile - - name: "testing perl version, static checks" - perl: "5.32" - env: TESTS=static - - name: "testing perl version, unit tests" - perl: "5.32" - env: TESTS=unit -env: - global: - - COMMIT_AUTHOR_EMAIL=skynet@open.qa -addons: - apt: - packages: - - libdbus-1-dev - - libssh2-1-dev - - parallel -cache: - directories: - - $HOME/perl5 -before_install: - - eval $(curl https://travis-perl.github.io/init) --perl --always-upgrade-modules - - echo "requires 'Code::DRY';" >> cpanfile - - echo "requires 'Date::Parse';" >> cpanfile - - echo "requires 'Regexp::Common';" >> cpanfile - - echo "requires 'Perl::Tidy', '== 20201001';" >> cpanfile - - sudo apt-get -y install yamllint -install: - - make prepare -script: - - git checkout cpanfile - - source script/generateLibDocs.sh - - make test -deploy: - provider: pages - skip_cleanup: true - github_token: $GITHUB_TOKEN - local-dir: $TRAVIS_BUILD_DIR/docs/ - on: - branch: master - condition: "$NEW_DEPLOY_NEEDED = 1 && $TESTS = unit" - target_branch: gh-pages From 7afe9e2cd9651331bd37ab218de164839c0a894e Mon Sep 17 00:00:00 2001 From: Rodion Iafarov Date: Thu, 3 Dec 2020 15:43:12 +0100 Subject: [PATCH 2/9] Run static and unit checks using github actions --- .github/workflows/static.yml | 34 ++++++++++++++++++++++++++++++++++ Makefile | 16 ++++++++-------- 2 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/static.yml diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml new file mode 100644 index 000000000000..c9beb5543d9a --- /dev/null +++ b/.github/workflows/static.yml @@ -0,0 +1,34 @@ +name: Static and unit checks + +on: pull_request + +jobs: + static: + runs-on: ubuntu-latest + name: "Running ${{ matrix.test }} tests with perl v${{ matrix.perl-version }}" + strategy: + matrix: + include: + - test: static + perl-version: 5.26 + - test: unit + perl-version: 5.26 + container: + image: perldocker/perl-tester:${{ matrix.perl-version }} + steps: + - uses: actions/checkout@v2 + - name: Install dependencies + run: apt-get -y install yamllint libdbus-1-dev libssh2-1-dev parallel + - name: Setup perl + run: | + echo "requires 'Code::DRY';" >> cpanfile + echo "requires 'Regexp::Common';" >> cpanfile + echo "requires 'Perl::Tidy', '== 20201001';" >> cpanfile + make prepare + - name: Run ${{ matrix.test }} tests + env: + TESTS: ${{ matrix.test }} + run: | + git fetch origin master + git checkout cpanfile + make test diff --git a/Makefile b/Makefile index e158617b19e1..0a73f6753a6f 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ test-yaml-valid: @# now because yamllint complains about a lot of existing files $(eval YAMLS=$(shell sh -c "git ls-files schedule/ test_data/ | grep '/.*\.y.\?ml$$'")) export PERL5LIB=${PERL5LIB_} ; tools/test_yaml_valid $(YAMLS);\ - $(eval CHANGED_YAMLS=$(shell sh -c "git --no-pager diff --diff-filter=dr --name-only master | grep '\(schedule\|test_data\)/.*\.y.\?ml$$'")) + $(eval CHANGED_YAMLS=$(shell sh -c "git --no-pager diff --diff-filter=dr --name-only FETCH_HEAD `git merge-base FETCH_HEAD origin/master` | grep '\(schedule\|test_data\)/.*\.y.\?ml$$'")) if test -n "$(CHANGED_YAMLS)"; then \ which yamllint >/dev/null 2>&1 || echo "Command 'yamllint' not found, can not execute YAML syntax checks";\ yamllint -c .yamllint $(CHANGED_YAMLS);\ @@ -72,7 +72,7 @@ test-yaml-valid: .PHONY: test-modules-in-yaml-schedule test-modules-in-yaml-schedule: - export PERL5LIB=${PERL5LIB_} ; tools/detect_nonexistent_modules_in_yaml_schedule `git diff --diff-filter=d --name-only --exit-code $$(git merge-base master HEAD) | grep '^schedule/*'` + export PERL5LIB=${PERL5LIB_} ; tools/detect_nonexistent_modules_in_yaml_schedule `git diff --diff-filter=d --name-only --exit-code FETCH_HEAD $$(git merge-base FETCH_HEAD origin/master) | grep '^schedule/*'` .PHONY: test-metadata test-metadata: @@ -84,9 +84,9 @@ test-metadata-changed: .PHONY: test-merge test-merge: - @REV=$$(git merge-base FETCH_HEAD master 2>/dev/null) ;\ + @REV=$$(git merge-base FETCH_HEAD origin/master 2>/dev/null) ;\ if test -n "$$REV"; then \ - FILES=$$(git diff --name-only FETCH_HEAD `git merge-base FETCH_HEAD master 2>/dev/null` | grep 'tests.*pm') ;\ + FILES=$$(git diff --name-only FETCH_HEAD `git merge-base FETCH_HEAD origin/master 2>/dev/null` | grep 'tests.*pm') ;\ for file in $$FILES; do if test -f $$file; then \ tools/check_metadata $$file || touch failed; \ git --no-pager grep wait_idle $$file && touch failed; \ @@ -130,9 +130,9 @@ perlcritic: tools/lib/ .PHONY: test-unused-modules-changed test-unused-modules-changed: @echo "[make] Unused modules check called over modified/new files only. For a full run use make test-unused-modules-full" - tools/detect_unused_modules -m `git --no-pager diff --name-only --diff-filter=d $$(git merge-base master HEAD) | grep '^tests/*' | grep -v '^tests/test_pods/'` - tools/detect_unused_modules -m `git --no-pager diff --unified=0 $$(git merge-base master HEAD) products/* | grep -oP "^-.*loadtest.*[\"']\K[^\"'].+(?=[\"'])"` - tools/detect_unused_modules -m `git --no-pager diff --unified=0 $$(git merge-base master HEAD) schedule/* | grep -oP "^-\s+- [\"']?\K.*(?=[\"']?)" | grep -v '{{'` + tools/detect_unused_modules -m `git --no-pager diff --name-only --diff-filter=d FETCH_HEAD $$(git merge-base FETCH_HEAD origin/master) | grep '^tests/*' | grep -v '^tests/test_pods/'` + tools/detect_unused_modules -m `git --no-pager diff --unified=0 FETCH_HEAD $$(git merge-base FETCH_HEAD origin/master) products/* | grep -oP "^-.*loadtest.*[\"']\K[^\"'].+(?=[\"'])"` + tools/detect_unused_modules -m `git --no-pager diff --unified=0 FETCH_HEAD $$(git merge-base FETCH_HEAD origin/master) schedule/* | grep -oP "^-\s+- [\"']?\K.*(?=[\"']?)" | grep -v '{{'` .PHONY: test-unused-modules test-unused-modules: @@ -140,7 +140,7 @@ test-unused-modules: .PHONY: test-deleted-renamed-referenced-files test-deleted-renamed-referenced-files: - tools/test_deleted_renamed_referenced_files `git diff --name-only --exit-code --diff-filter=DR $$(git merge-base master HEAD) | grep '^test*'` + tools/test_deleted_renamed_referenced_files `git diff --name-only --exit-code --diff-filter=DR FETCH_HEAD $$(git merge-base FETCH_HEAD origin/master) | grep '^test*'` .PHONY: test-soft_failure-no-reference test-soft_failure-no-reference: From 77878c9150c469da0b6528cbc5333825710834d1 Mon Sep 17 00:00:00 2001 From: Rodion Iafarov Date: Thu, 3 Dec 2020 16:58:28 +0100 Subject: [PATCH 3/9] Test only added and changed yaml files in CI --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0a73f6753a6f..c90161df9d8e 100644 --- a/Makefile +++ b/Makefile @@ -60,10 +60,9 @@ test-compile-changed: os-autoinst/ test-yaml-valid: @# Get list of changed yaml files. We only want to lint changed files for @# now because yamllint complains about a lot of existing files - $(eval YAMLS=$(shell sh -c "git ls-files schedule/ test_data/ | grep '/.*\.y.\?ml$$'")) - export PERL5LIB=${PERL5LIB_} ; tools/test_yaml_valid $(YAMLS);\ $(eval CHANGED_YAMLS=$(shell sh -c "git --no-pager diff --diff-filter=dr --name-only FETCH_HEAD `git merge-base FETCH_HEAD origin/master` | grep '\(schedule\|test_data\)/.*\.y.\?ml$$'")) if test -n "$(CHANGED_YAMLS)"; then \ + export PERL5LIB=${PERL5LIB_} ; tools/test_yaml_valid $(CHANGED_YAMLS);\ which yamllint >/dev/null 2>&1 || echo "Command 'yamllint' not found, can not execute YAML syntax checks";\ yamllint -c .yamllint $(CHANGED_YAMLS);\ else \ From b06e1f485810f6c04ed9c1acc98a4c34fd78ef2f Mon Sep 17 00:00:00 2001 From: Rodion Iafarov Date: Thu, 3 Dec 2020 17:03:25 +0100 Subject: [PATCH 4/9] Fix sorting in os-autoinst-distri-opensuse-deps.spec Our CI check breaks because expects uppercase modules to be listed before lowercase ones. --- os-autoinst-distri-opensuse-deps.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/os-autoinst-distri-opensuse-deps.spec b/os-autoinst-distri-opensuse-deps.spec index 13f9e5b639e9..d8fa7c58ca04 100644 --- a/os-autoinst-distri-opensuse-deps.spec +++ b/os-autoinst-distri-opensuse-deps.spec @@ -29,7 +29,6 @@ Requires: perl(Archive::Tar) Requires: perl(Carp) Requires: perl(Code::DRY) Requires: perl(Config::Tiny) -Requires: perl(constant) Requires: perl(Cwd) Requires: perl(Data::Dump) Requires: perl(Data::Dumper) @@ -42,35 +41,36 @@ Requires: perl(File::Path) Requires: perl(File::Temp) Requires: perl(IO::File) Requires: perl(IO::Socket::INET) +Requires: perl(LWP::Simple) Requires: perl(List::MoreUtils) Requires: perl(List::Util) -Requires: perl(LWP::Simple) Requires: perl(Mojo::Base) Requires: perl(Mojo::File) Requires: perl(Mojo::JSON) Requires: perl(Mojo::UserAgent) Requires: perl(Mojo::Util) -Requires: perl(parent) -Requires: perl(Perl::Critic::Freenode) Requires: perl(POSIX) +Requires: perl(Perl::Critic::Freenode) Requires: perl(Regexp::Common) Requires: perl(Selenium::Chrome) Requires: perl(Selenium::Remote::Driver) Requires: perl(Selenium::Remote::WDKeys) Requires: perl(Selenium::Waiter) Requires: perl(Storable) -Requires: perl(strict) Requires: perl(Term::ANSIColor) Requires: perl(Test::Assert) Requires: perl(Tie::IxHash) Requires: perl(Time::HiRes) -Requires: perl(utf8) -Requires: perl(version) -Requires: perl(warnings) Requires: perl(XML::LibXML) Requires: perl(XML::Simple) Requires: perl(XML::Writer) Requires: perl(YAML::PP) +Requires: perl(constant) +Requires: perl(parent) +Requires: perl(strict) +Requires: perl(utf8) +Requires: perl(version) +Requires: perl(warnings) # END AUTOGENERATED DEPENDENCY LIST Recommends: os-autoinst From 327bfa4b91e7c66e2a2f0e492c2850b77be48d97 Mon Sep 17 00:00:00 2001 From: Rodion Iafarov Date: Fri, 4 Dec 2020 11:29:13 +0100 Subject: [PATCH 5/9] Get rid of git merge-base calls git diff allows to provide same arguments as we did for getting last commit in the master branch. --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index c90161df9d8e..693d182922b3 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ test-compile-changed: os-autoinst/ test-yaml-valid: @# Get list of changed yaml files. We only want to lint changed files for @# now because yamllint complains about a lot of existing files - $(eval CHANGED_YAMLS=$(shell sh -c "git --no-pager diff --diff-filter=dr --name-only FETCH_HEAD `git merge-base FETCH_HEAD origin/master` | grep '\(schedule\|test_data\)/.*\.y.\?ml$$'")) + $(eval CHANGED_YAMLS=$(shell sh -c "git --no-pager diff --diff-filter=dr --name-only origin/master | grep '\(schedule\|test_data\)/.*\.y.\?ml$$'")) if test -n "$(CHANGED_YAMLS)"; then \ export PERL5LIB=${PERL5LIB_} ; tools/test_yaml_valid $(CHANGED_YAMLS);\ which yamllint >/dev/null 2>&1 || echo "Command 'yamllint' not found, can not execute YAML syntax checks";\ @@ -71,7 +71,7 @@ test-yaml-valid: .PHONY: test-modules-in-yaml-schedule test-modules-in-yaml-schedule: - export PERL5LIB=${PERL5LIB_} ; tools/detect_nonexistent_modules_in_yaml_schedule `git diff --diff-filter=d --name-only --exit-code FETCH_HEAD $$(git merge-base FETCH_HEAD origin/master) | grep '^schedule/*'` + export PERL5LIB=${PERL5LIB_} ; tools/detect_nonexistent_modules_in_yaml_schedule `git diff --diff-filter=d --name-only --exit-code origin/master | grep '^schedule/*'` .PHONY: test-metadata test-metadata: @@ -83,9 +83,9 @@ test-metadata-changed: .PHONY: test-merge test-merge: - @REV=$$(git merge-base FETCH_HEAD origin/master 2>/dev/null) ;\ + @REV=$$(git merge-base origin/master 2>/dev/null) ;\ if test -n "$$REV"; then \ - FILES=$$(git diff --name-only FETCH_HEAD `git merge-base FETCH_HEAD origin/master 2>/dev/null` | grep 'tests.*pm') ;\ + FILES=$$(git diff --name-only origin/master | grep 'tests.*pm') ;\ for file in $$FILES; do if test -f $$file; then \ tools/check_metadata $$file || touch failed; \ git --no-pager grep wait_idle $$file && touch failed; \ @@ -129,9 +129,9 @@ perlcritic: tools/lib/ .PHONY: test-unused-modules-changed test-unused-modules-changed: @echo "[make] Unused modules check called over modified/new files only. For a full run use make test-unused-modules-full" - tools/detect_unused_modules -m `git --no-pager diff --name-only --diff-filter=d FETCH_HEAD $$(git merge-base FETCH_HEAD origin/master) | grep '^tests/*' | grep -v '^tests/test_pods/'` - tools/detect_unused_modules -m `git --no-pager diff --unified=0 FETCH_HEAD $$(git merge-base FETCH_HEAD origin/master) products/* | grep -oP "^-.*loadtest.*[\"']\K[^\"'].+(?=[\"'])"` - tools/detect_unused_modules -m `git --no-pager diff --unified=0 FETCH_HEAD $$(git merge-base FETCH_HEAD origin/master) schedule/* | grep -oP "^-\s+- [\"']?\K.*(?=[\"']?)" | grep -v '{{'` + tools/detect_unused_modules -m `git --no-pager diff --name-only --diff-filter=d origin/master | grep '^tests/*' | grep -v '^tests/test_pods/'` + tools/detect_unused_modules -m `git --no-pager diff --unified=0 origin/master products/* | grep -oP "^-.*loadtest.*[\"']\K[^\"'].+(?=[\"'])"` + tools/detect_unused_modules -m `git --no-pager diff --unified=0 origin/master schedule/* | grep -oP "^-\s+- [\"']?\K.*(?=[\"']?)" | grep -v '{{'` .PHONY: test-unused-modules test-unused-modules: @@ -139,7 +139,7 @@ test-unused-modules: .PHONY: test-deleted-renamed-referenced-files test-deleted-renamed-referenced-files: - tools/test_deleted_renamed_referenced_files `git diff --name-only --exit-code --diff-filter=DR FETCH_HEAD $$(git merge-base FETCH_HEAD origin/master) | grep '^test*'` + tools/test_deleted_renamed_referenced_files `git diff --name-only --exit-code --diff-filter=DR origin/master | grep '^test*'` .PHONY: test-soft_failure-no-reference test-soft_failure-no-reference: From 320d47b0e4c6dd1be1b0d21b6c9e4977e6de3845 Mon Sep 17 00:00:00 2001 From: Rodion Iafarov Date: Fri, 4 Dec 2020 12:39:16 +0100 Subject: [PATCH 6/9] Enable docs generation With travis we would check variable which is set when there are chnages in the doc, with github actions it's not --- .github/workflows/static.yml | 17 +++++++- script/generateLibDocs.sh | 82 +++++++++++++++++------------------- 2 files changed, 54 insertions(+), 45 deletions(-) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index c9beb5543d9a..726f4791934a 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -1,4 +1,4 @@ -name: Static and unit checks +name: PR CI on: pull_request @@ -32,3 +32,18 @@ jobs: git fetch origin master git checkout cpanfile make test + documentation: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Generate documentation + id: generate + run: script/generateLibDocs.sh + continue-on-error: true + - name: Deploy documentation + if: ${{ success() }} && ${{ steps.generate.outcome }} == 'success') + uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./docs + publish_branch: gh-pages diff --git a/script/generateLibDocs.sh b/script/generateLibDocs.sh index b887a55cabc7..ecc4b8f103d5 100755 --- a/script/generateLibDocs.sh +++ b/script/generateLibDocs.sh @@ -15,50 +15,44 @@ # You should have received a copy of the GNU General Public License along # with this program; if not, see . -NEW_DEPLOY_NEEDED=0 - -if [ -z $GITHUB_TOKEN ] ; then - NEW_DEPLOY_NEEDED=0 -else - cd $TRAVIS_BUILD_DIR - - git fetch origin gh-pages:gh-pages - - echo "Documentation of libs" > docs/index.html - echo "
  • libs/
      • " >> docs/index.html - - for docfile in $(cd lib ; grep -rs ^=head * | grep .pm | cut -d. -f1 | sort -u) ; do - echo "Generating docs for lib/${docfile}.pm" - echo "
    • ${docfile}.pm
      • " >> docs/index.html - mkdir -p docs/$(dirname ${docfile}) - touch docs/${docfile}.html - pod2html --infile=lib/${docfile}.pm --outfile=docs/${docfile}.html - # remove line that contains perl version and breaks diff - sed -i '/^|\n|" docs/${docfile}.html - sed -i "s|>|>lib/${docfile}.pm|" docs/${docfile}.html - sed -i "s|
        |
        • \<= Back to file list
          • |" docs/${docfile}.html - # only replace first occurance - awk "NR==1,/^<\/ul>/{sub(/^<\/ul>/, \"

        lib/${docfile}.pm

        \")} 1" docs/${docfile}.html > docs/${docfile}.html.tmp - mv docs/${docfile}.html.tmp docs/${docfile}.html - - #checkout old docs and compare to new ones, then toggle flag accordingly - git checkout gh-pages ${docfile}.html 2>/dev/null || touch ${docfile}.html - diff -u ${docfile}.html docs/${docfile}.html - diff_ret_val=$? - if [ "${ret_val}" = "0" ] ; then - ret_val="$diff_ret_val" - fi - git reset HEAD ${docfile}.html - rm ${docfile}.html - done +git fetch origin gh-pages:gh-pages + +echo "Documentation of libs" > docs/index.html +echo "
        • libs/
            • " >> docs/index.html + +ret_val=0 + +for docfile in $(cd lib ; grep -rs ^=head * | grep .pm | cut -d. -f1 | sort -u) ; do + echo "Generating docs for lib/${docfile}.pm" + echo "
          • ${docfile}.pm
            • " >> docs/index.html + mkdir -p docs/$(dirname ${docfile}) + touch docs/${docfile}.html + pod2html --infile=lib/${docfile}.pm --outfile=docs/${docfile}.html + # remove line that contains perl version and breaks diff + sed -i '/^|\n|" docs/${docfile}.html + sed -i "s|>|>lib/${docfile}.pm|" docs/${docfile}.html + sed -i "s|
              |
              • \<= Back to file list
                • |" docs/${docfile}.html + # only replace first occurance + awk "NR==1,/^<\/ul>/{sub(/^<\/ul>/, \"

              lib/${docfile}.pm

              \")} 1" docs/${docfile}.html > docs/${docfile}.html.tmp + mv docs/${docfile}.html.tmp docs/${docfile}.html + + #checkout old docs and compare to new ones, then toggle flag accordingly + git checkout gh-pages ${docfile}.html 2>/dev/null || touch ${docfile}.html + diff -u ${docfile}.html docs/${docfile}.html + diff_ret_val=$? + if [ "${ret_val}" = "0" ] ; then + ret_val="$diff_ret_val" + fi + git reset HEAD ${docfile}.html + rm ${docfile}.html +done - echo "
          " >> docs/index.html +echo "
      " >> docs/index.html - if [ "${ret_val}" != "0" ] ; then - NEW_DEPLOY_NEEDED=1 - else - NEW_DEPLOY_NEEDED=0 - fi +if [ "${ret_val}" != "0" ] ; then + exit 0 +else + exit 1 fi From 552523df438f4e2940e28b5d66f79c2e9d6f758f Mon Sep 17 00:00:00 2001 From: Rodion Iafarov Date: Fri, 4 Dec 2020 16:02:54 +0100 Subject: [PATCH 7/9] Enable compile check --- .github/workflows/static.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 726f4791934a..4f69cfa2eb4b 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -13,6 +13,8 @@ jobs: perl-version: 5.26 - test: unit perl-version: 5.26 + - test: compile + perl-version: 5.18 container: image: perldocker/perl-tester:${{ matrix.perl-version }} steps: From 5b8d39b3ed136d9381473a2532c810b3d37bb2a0 Mon Sep 17 00:00:00 2001 From: Rodion Iafarov Date: Fri, 4 Dec 2020 16:20:19 +0100 Subject: [PATCH 8/9] Move pod deploy to the merging stage --- .github/workflows/deploy.yml | 19 +++++++++++++++++++ .github/workflows/static.yml | 16 +--------------- script/generateLibDocs.sh | 6 ------ 3 files changed, 20 insertions(+), 21 deletions(-) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 000000000000..d88c45936dff --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,19 @@ +name: Deploy + +on: + push: + branches: + - master + +jobs: + documentation: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Generate documentation + run: script/generateLibDocs.sh + - name: Deploy documentation + uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./docs diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 4f69cfa2eb4b..7f0165c2314d 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -24,6 +24,7 @@ jobs: - name: Setup perl run: | echo "requires 'Code::DRY';" >> cpanfile + echo "requires 'Date::Parse';" >> cpanfile echo "requires 'Regexp::Common';" >> cpanfile echo "requires 'Perl::Tidy', '== 20201001';" >> cpanfile make prepare @@ -34,18 +35,3 @@ jobs: git fetch origin master git checkout cpanfile make test - documentation: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Generate documentation - id: generate - run: script/generateLibDocs.sh - continue-on-error: true - - name: Deploy documentation - if: ${{ success() }} && ${{ steps.generate.outcome }} == 'success') - uses: peaceiris/actions-gh-pages@v3 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./docs - publish_branch: gh-pages diff --git a/script/generateLibDocs.sh b/script/generateLibDocs.sh index ecc4b8f103d5..42a3a6d4bb03 100755 --- a/script/generateLibDocs.sh +++ b/script/generateLibDocs.sh @@ -50,9 +50,3 @@ for docfile in $(cd lib ; grep -rs ^=head * | grep .pm | cut -d. -f1 | sort -u) done echo "
" >> docs/index.html - -if [ "${ret_val}" != "0" ] ; then - exit 0 -else - exit 1 -fi From add1dbd1e9c13a693c8b005d60f77bef453f356d Mon Sep 17 00:00:00 2001 From: Rodion Iafarov Date: Mon, 7 Dec 2020 09:08:12 +0100 Subject: [PATCH 9/9] Update perl versions as per current state As is correctly pointed out in #11561, we have version 5.26 installed on the production instances and perl 5.32 is available in Factory. --- .github/workflows/static.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 7f0165c2314d..02544e95b09e 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -10,11 +10,11 @@ jobs: matrix: include: - test: static - perl-version: 5.26 + perl-version: 5.32 - test: unit - perl-version: 5.26 + perl-version: 5.32 - test: compile - perl-version: 5.18 + perl-version: 5.26 container: image: perldocker/perl-tester:${{ matrix.perl-version }} steps: