diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index a3b28b03..764a58ee 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -8,7 +8,7 @@ on: jobs: sort_dictionary: if: github.repository == 'ru-de/faq' - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -18,10 +18,10 @@ jobs: git config --global user.email "actions@github.com" git config --global user.name "Github Actions" LC_ALL=ru_RU.UTF8 sort files/ci/dictionary.dic -o files/ci/dictionary.dic -f - if ! git diff HEAD --quiet; then git commit -q -am "dictionary rearrangement" && git push; fi + if ! git diff HEAD --quiet; then git commit -q -am "re-order dictionary" && git push; fi update_github_pages: if: github.repository == 'ru-de/faq' - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aaf5ebea..d5f58067 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: jobs: spell_and_dead_links_checks: if: github.repository == 'ru-de/faq' - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/setup-go@v2 with: diff --git a/files/ci/check-install.sh b/files/ci/check-install.sh index e375e09c..9db05469 100644 --- a/files/ci/check-install.sh +++ b/files/ci/check-install.sh @@ -6,10 +6,7 @@ PWD_DIR=`pwd` DIR=`dirname $0` apt-get -yqq update && apt-get install -y curl wget unzip binutils hunspell hunspell-ru hunspell-en-us hunspell-de-de jq -curl -s https://extensions.libreoffice.org/en/extensions/show/russian-spellcheck-dictionary > .dict_page -echo -n "https://extensions.libreoffice.org" > .current_release -strings .dict_page | grep -ozP '
  • (\n|.)*?
  • ' | grep -zoP -m 1 'href=".*?">Download' | head -1 | sed 's/href="//' | sed 's/">Download//' >> .current_release -cat .current_release | wget -q -i - -O /tmp/dictionary.otx +wget https://extensions.libreoffice.org/assets/downloads/48/dict_ru_ru-aot-0.4.5.oxt -O /tmp/dictionary.otx unzip /tmp/dictionary.otx -d /tmp cp /tmp/*.dic /usr/share/hunspell cp /tmp/*.aff /usr/share/hunspell @@ -35,12 +32,12 @@ done echo "SET UTF-8" >> /tmp/dictionary.aff mv /tmp/dictionary.* /usr/share/hunspell -go get -u github.com/ewgRa/ci-utils/cmd/diff_liner -go get -u github.com/ewgRa/ci-utils/cmd/hunspell_parser -go get -u github.com/ewgRa/ci-utils/cmd/github_comments_diff -go get -u github.com/ewgRa/ci-utils/cmd/github_comments_send +go install github.com/ewgRa/ci-utils/cmd/diff_liner@latest +go install github.com/ewgRa/ci-utils/cmd/hunspell_parser@latest +go install github.com/ewgRa/ci-utils/cmd/github_comments_diff@latest +go install github.com/ewgRa/ci-utils/cmd/github_comments_send@latest cd $DIR/go go build -o /tmp/check_spell check_spell/main.go go build -o /tmp/check_links check_links/main.go -cd $PWD_DIR \ No newline at end of file +cd $PWD_DIR