diff options
-rw-r--r-- | .github/workflows/broken-links.yml | 2 | ||||
-rw-r--r-- | .github/workflows/create-prerelease-on-tag.yml | 2 | ||||
-rw-r--r-- | .github/workflows/playwright.yml | 2 | ||||
-rw-r--r-- | .github/workflows/playwright_comment.yml | 4 | ||||
-rw-r--r-- | .github/workflows/publish-chrome-development.yml | 2 | ||||
-rw-r--r-- | .github/workflows/publish-chrome.yml | 2 | ||||
-rw-r--r-- | .github/workflows/publish-firefox-development.yml | 8 | ||||
-rw-r--r-- | .github/workflows/publish-firefox.yml | 2 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | ext/settings.html | 2 |
10 files changed, 17 insertions, 11 deletions
diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml index 3d318005..bb2028c6 100644 --- a/.github/workflows/broken-links.yml +++ b/.github/workflows/broken-links.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: lycheeverse/lychee-action@9ace499fe66cee282a29eaa628fdac2c72fa087f + - uses: lycheeverse/lychee-action@ec3ed119d4f44ad2673a7232460dc7dff59d2421 with: fail: true jobSummary: false diff --git a/.github/workflows/create-prerelease-on-tag.yml b/.github/workflows/create-prerelease-on-tag.yml index 3d749c58..06cb8c7e 100644 --- a/.github/workflows/create-prerelease-on-tag.yml +++ b/.github/workflows/create-prerelease-on-tag.yml @@ -25,6 +25,7 @@ jobs: shell: bash - name: Release + id: release uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # pin@v0.1.15 with: generate_release_notes: true @@ -44,3 +45,4 @@ jobs: workflow: publish-firefox-development token: ${{ secrets.GITHUB_TOKEN }} wait-for-completion: false + inputs: '{ "upload_url": "${{ steps.release.outputs.upload_url }}" }' diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index 690e76d4..a8127388 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -46,7 +46,7 @@ jobs: path: dictionaries - name: Grab latest screenshots from master branch - uses: dawidd6/action-download-artifact@5e780fc7bbd0cac69fc73271ed86edf5dcb72d67 # pin@v2 + uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615 # pin@v2 continue-on-error: true id: master-screenshots with: diff --git a/.github/workflows/playwright_comment.yml b/.github/workflows/playwright_comment.yml index 89c39274..d5a6727b 100644 --- a/.github/workflows/playwright_comment.yml +++ b/.github/workflows/playwright_comment.yml @@ -16,7 +16,7 @@ jobs: github.event.workflow_run.conclusion == 'success' steps: - name: Grab playwright-output from PR run - uses: dawidd6/action-download-artifact@5e780fc7bbd0cac69fc73271ed86edf5dcb72d67 # pin@v2 + uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615 # pin@v2 continue-on-error: true with: github_token: ${{ secrets.GITHUB_TOKEN }} @@ -24,7 +24,7 @@ jobs: name: playwright-output - name: Grab master-screenshots-outcome from PR run - uses: dawidd6/action-download-artifact@5e780fc7bbd0cac69fc73271ed86edf5dcb72d67 # pin@v2 + uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615 # pin@v2 continue-on-error: true with: github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/publish-chrome-development.yml b/.github/workflows/publish-chrome-development.yml index bf866f67..7addfc99 100644 --- a/.github/workflows/publish-chrome-development.yml +++ b/.github/workflows/publish-chrome-development.yml @@ -38,7 +38,7 @@ jobs: return attempt < max ? attempt + 1 : ''; } - - uses: robinraju/release-downloader@768b85c8d69164800db5fc00337ab917daf3ce68 # pin@v1.7 + - uses: robinraju/release-downloader@efa4cd07bd0195e6cc65e9e30c251b49ce4d3e51 # pin@v1.8 with: tag: ${{ github.ref_name }} fileName: "*" diff --git a/.github/workflows/publish-chrome.yml b/.github/workflows/publish-chrome.yml index e1502165..3a2805d3 100644 --- a/.github/workflows/publish-chrome.yml +++ b/.github/workflows/publish-chrome.yml @@ -40,7 +40,7 @@ jobs: return attempt < max ? attempt + 1 : ''; } - - uses: robinraju/release-downloader@768b85c8d69164800db5fc00337ab917daf3ce68 # pin@v1.7 + - uses: robinraju/release-downloader@efa4cd07bd0195e6cc65e9e30c251b49ce4d3e51 # pin@v1.8 with: tag: ${{ github.ref_name }} fileName: "*" diff --git a/.github/workflows/publish-firefox-development.yml b/.github/workflows/publish-firefox-development.yml index 6ce61dc5..6a4e6ce8 100644 --- a/.github/workflows/publish-firefox-development.yml +++ b/.github/workflows/publish-firefox-development.yml @@ -5,6 +5,10 @@ name: publish-firefox-development on: workflow_dispatch: + inputs: + upload_url: + description: "The upload_url from the release created by create-prerelease-on-tag.yml" + required: true permissions: contents: read jobs: @@ -14,7 +18,7 @@ jobs: permissions: contents: write steps: - - uses: robinraju/release-downloader@768b85c8d69164800db5fc00337ab917daf3ce68 # pin@v1.7 + - uses: robinraju/release-downloader@efa4cd07bd0195e6cc65e9e30c251b49ce4d3e51 # pin@v1.8 with: tag: ${{ github.ref_name }} fileName: "*" @@ -44,7 +48,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - upload_url: ${{ github.event.release.upload_url }} + upload_url: ${{ inputs.upload_url }} asset_path: yomitan-firefox.xpi asset_name: yomitan-firefox.xpi asset_content_type: application/x-xpinstall diff --git a/.github/workflows/publish-firefox.yml b/.github/workflows/publish-firefox.yml index 1dd6d260..272593c1 100644 --- a/.github/workflows/publish-firefox.yml +++ b/.github/workflows/publish-firefox.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest environment: cd steps: - - uses: robinraju/release-downloader@768b85c8d69164800db5fc00337ab917daf3ce68 # pin@v1.7 + - uses: robinraju/release-downloader@efa4cd07bd0195e6cc65e9e30c251b49ce4d3e51 # pin@v1.8 with: tag: ${{ github.ref_name }} fileName: "*" @@ -52,7 +52,7 @@ New changes are initially introduced into the *testing* version, and after some relatively bug free, they will be promoted to the *stable* version. If you are technically savvy and don't mind submitting issues on GitHub, try the *testing* version; otherwise, the *stable* version will be your best bet. -> :warning: These are releases are not updated yet and still link to yomichan. +> :warning: These releases haven't been updated and still link to yomichan. * **Google Chrome** ([stable](https://chrome.google.com/webstore/detail/yomichan/ogmnaimimemjmbakcfefmnahgdfhfami) or [testing](https://chrome.google.com/webstore/detail/yomichan-testing/bcknnfebhefllbjhagijobjklocakpdm)) \ diff --git a/ext/settings.html b/ext/settings.html index 0bb0efc8..62e06e98 100644 --- a/ext/settings.html +++ b/ext/settings.html @@ -2408,7 +2408,7 @@ <div class="warning-text margin-above no-dictionaries-installed-warning" hidden> No dictionaries have been installed yet. Visit the <a href="https://github.com/themoeway/yomitan#dictionaries" target="_blank" rel="noopener noreferrer">Yomitan homepage</a> - for a list free dictionaries or click the <em>Import</em> button below to select a dictionary file to import. + for a list of free dictionaries or click the <em>Import</em> button below to select a dictionary file to import. </div> <div id="dictionary-error" class="danger-text margin-above" hidden></div> <div id="dictionary-list" class="dictionary-list generic-list" data-count="0"> |