From 42df2dc5d83ffbdb4db95cf06802601669506158 Mon Sep 17 00:00:00 2001 From: Ignotus Date: Mon, 26 Dec 2022 09:16:48 +0100 Subject: [PATCH 1/4] Add missing dependency to script and re-name key --- .github/workflows/add-lang.yml | 2 +- .github/workflows/jekyll.yml | 2 +- .github/workflows/main.yml | 2 +- _po4a-tools/po4a-cache.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/add-lang.yml b/.github/workflows/add-lang.yml index 0a9a12f11..9f6b86f5b 100644 --- a/.github/workflows/add-lang.yml +++ b/.github/workflows/add-lang.yml @@ -48,7 +48,7 @@ jobs: id: cache-po4a with: path: "~/po4a" - key: ${{ runner.os }}-po4a-0.68 + key: ${{ runner.os }}-po4a - name: Install/retrieve po4a from cache env: CACHE_HIT: ${{ steps.cache-po4a.outputs.cache-hit }} diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml index d0ac3092e..b180adb16 100644 --- a/.github/workflows/jekyll.yml +++ b/.github/workflows/jekyll.yml @@ -29,7 +29,7 @@ jobs: id: cache-po4a with: path: "~/po4a" - key: ${{ runner.os }}-po4a-0.68 + key: ${{ runner.os }}-po4a - name: Install or retrieve po4a from cache env: CACHE_HIT: ${{steps.cache-po4a.outputs.cache-hit}} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 529de20ff..1a7bac976 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: id: cache-po4a with: path: "~/po4a" - key: ${{ runner.os }}-po4a-0.68 + key: ${{ runner.os }}-po4a - name: Install or retrieve po4a from cache env: CACHE_HIT: ${{steps.cache-po4a.outputs.cache-hit}} diff --git a/_po4a-tools/po4a-cache.sh b/_po4a-tools/po4a-cache.sh index 735efafc0..277a46b40 100755 --- a/_po4a-tools/po4a-cache.sh +++ b/_po4a-tools/po4a-cache.sh @@ -16,7 +16,7 @@ fi mkdir -p ~/po4a -for dep in po4a libcroco3 libosp5 sgml-base gettext libsgmls-perl libyaml-tiny-perl opensp libsyntax-keyword-try-perl; do +for dep in po4a libcroco3 libosp5 sgml-base gettext libsgmls-perl libyaml-tiny-perl opensp libsyntax-keyword-try-perl libs-parse-keyword-perl; do dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/po4a/ done fi From 5aadbc471b5bdc1441e9cd1ad1e868704aebdd2b Mon Sep 17 00:00:00 2001 From: Ignotus Date: Mon, 26 Dec 2022 09:33:41 +0100 Subject: [PATCH 2/4] Change cache key --- .github/workflows/add-lang.yml | 2 +- .github/workflows/jekyll.yml | 2 +- .github/workflows/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/add-lang.yml b/.github/workflows/add-lang.yml index 9f6b86f5b..f12f152d6 100644 --- a/.github/workflows/add-lang.yml +++ b/.github/workflows/add-lang.yml @@ -48,7 +48,7 @@ jobs: id: cache-po4a with: path: "~/po4a" - key: ${{ runner.os }}-po4a + key: ${{ runner.os }}-po4a-key - name: Install/retrieve po4a from cache env: CACHE_HIT: ${{ steps.cache-po4a.outputs.cache-hit }} diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml index b180adb16..6d1aae21c 100644 --- a/.github/workflows/jekyll.yml +++ b/.github/workflows/jekyll.yml @@ -29,7 +29,7 @@ jobs: id: cache-po4a with: path: "~/po4a" - key: ${{ runner.os }}-po4a + key: ${{ runner.os }}-po4a-key - name: Install or retrieve po4a from cache env: CACHE_HIT: ${{steps.cache-po4a.outputs.cache-hit}} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1a7bac976..d08559255 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: id: cache-po4a with: path: "~/po4a" - key: ${{ runner.os }}-po4a + key: ${{ runner.os }}-po4a-key - name: Install or retrieve po4a from cache env: CACHE_HIT: ${{steps.cache-po4a.outputs.cache-hit}} From 753c7005a9f964f61a450aab325d8d2368c19260 Mon Sep 17 00:00:00 2001 From: Ignotus Date: Mon, 26 Dec 2022 09:40:27 +0100 Subject: [PATCH 3/4] Add dependency --- _po4a-tools/po4a-cache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_po4a-tools/po4a-cache.sh b/_po4a-tools/po4a-cache.sh index 277a46b40..efc4c1752 100755 --- a/_po4a-tools/po4a-cache.sh +++ b/_po4a-tools/po4a-cache.sh @@ -6,7 +6,7 @@ if [[ "$CACHE_HIT" == 'true' ]] ; then sudo cp --force --recursive ~/po4a/* / else - sudo apt install -yq gettext libsgmls-perl libyaml-tiny-perl opensp libsyntax-keyword-try-perl + sudo apt install -yq gettext libsgmls-perl libyaml-tiny-perl opensp libsyntax-keyword-try-perl libs-parse-keyword-perl wget -O po4a.deb https://github.com/jamulussoftware/assets/raw/main/po4a/po4a_0.68.deb sudo dpkg -i po4a.deb From 7ddf4613a69948267db85e2613e0c026833661e5 Mon Sep 17 00:00:00 2001 From: Ignotus Date: Mon, 26 Dec 2022 09:48:44 +0100 Subject: [PATCH 4/4] Correct dependency spelling --- _po4a-tools/po4a-cache.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_po4a-tools/po4a-cache.sh b/_po4a-tools/po4a-cache.sh index efc4c1752..09478d3a7 100755 --- a/_po4a-tools/po4a-cache.sh +++ b/_po4a-tools/po4a-cache.sh @@ -6,7 +6,7 @@ if [[ "$CACHE_HIT" == 'true' ]] ; then sudo cp --force --recursive ~/po4a/* / else - sudo apt install -yq gettext libsgmls-perl libyaml-tiny-perl opensp libsyntax-keyword-try-perl libs-parse-keyword-perl + sudo apt install -yq gettext libsgmls-perl libyaml-tiny-perl opensp libsyntax-keyword-try-perl libxs-parse-keyword-perl wget -O po4a.deb https://github.com/jamulussoftware/assets/raw/main/po4a/po4a_0.68.deb sudo dpkg -i po4a.deb @@ -16,7 +16,7 @@ fi mkdir -p ~/po4a -for dep in po4a libcroco3 libosp5 sgml-base gettext libsgmls-perl libyaml-tiny-perl opensp libsyntax-keyword-try-perl libs-parse-keyword-perl; do +for dep in po4a libcroco3 libosp5 sgml-base gettext libsgmls-perl libyaml-tiny-perl opensp libsyntax-keyword-try-perl libxs-parse-keyword-perl; do dpkg -L $dep | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/po4a/ done fi