diff --git a/.github/workflows/publishChrome.yml b/.github/workflows/publishChrome.yml index a54e1eff9..016aba67e 100644 --- a/.github/workflows/publishChrome.yml +++ b/.github/workflows/publishChrome.yml @@ -51,16 +51,13 @@ jobs: pnpm install --frozen-lockfile --prefer-offline pnpm install -g chrome-webstore-upload-cli - - name: Get extension version - run: |- - echo "EXTENSION_VERSION=$(node -e "console.log(require('./packages/app/package.json').version)")" >> $GITHUB_ENV - - name: Build chrome artifact env: TARGET: "chrome" MANIFEST_VERSION: 3 run: |- pnpm run build + echo "EXTENSION_VERSION=$(node -e "console.log('${{ github.ref_name }}'.split('-')[1])")" >> $GITHUB_ENV zip -r cryptkeeper-chrome-extension-v${{ env.EXTENSION_VERSION }}.zip ./packages/app/dist - name: Sign build diff --git a/.github/workflows/publishFirefox.yml b/.github/workflows/publishFirefox.yml index b0bb86785..9e12ac95f 100644 --- a/.github/workflows/publishFirefox.yml +++ b/.github/workflows/publishFirefox.yml @@ -51,16 +51,13 @@ jobs: pnpm install --frozen-lockfile --prefer-offline pnpm install -g web-ext web-ext-submit - - name: Get extension version - run: |- - echo "EXTENSION_VERSION=$(node -e "console.log(require('./packages/app/package.json').version)")" >> $GITHUB_ENV - - name: Build firefox artifact env: TARGET: "firefox" MANIFEST_VERSION: 2 run: |- pnpm run build + echo "EXTENSION_VERSION=$(node -e "console.log('${{ github.ref_name }}'.split('-')[1])")" >> $GITHUB_ENV zip -r cryptkeeper-firefox-extension-v${{ env.EXTENSION_VERSION }}.zip ./packages/app/dist - name: Sign build @@ -82,6 +79,6 @@ jobs: - name: Upload build run: |- - gh release upload "${{ github.ref_name }}" "cryptkeeper-firefox-extension-v${{ env.EXTENSION_VERSION }}.zip" "cryptkeeper-firefox-extension-checksum-v${{ env.EXTENSION_VERSION }}.txt" "cryptkeeper-firefox-extension-v${{ env.EXTENSION_VERSION }}.zip.asc" + gh release upload "${{ github.ref_name }}" "./packages/app/dist/cryptkeeper-firefox-extension-v${{ env.EXTENSION_VERSION }}.zip" "cryptkeeper-firefox-extension-checksum-v${{ env.EXTENSION_VERSION }}.txt" "cryptkeeper-firefox-extension-v${{ env.EXTENSION_VERSION }}.zip.asc" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/publishPackages.yml b/.github/workflows/publishPackages.yml index 2c32bfaac..5b8eea3a6 100644 --- a/.github/workflows/publishPackages.yml +++ b/.github/workflows/publishPackages.yml @@ -49,9 +49,10 @@ jobs: - run: pnpm install --frozen-lockfile --prefer-offline - - name: Get versions + - name: Get providers version + if: startsWith(github.ref_name, '@cryptkeeperzk/providers-') == true run: |- - echo "PROVIDERS_VERSION=$(node -e "console.log(require('./packages/providers/package.json').version)")" >> $GITHUB_ENV + echo "PROVIDERS_VERSION=$(node -e "console.log('${{ github.ref_name }}'.split('-')[1])")" >> $GITHUB_ENV - run: |- pnpm run build diff --git a/packages/app/src/setupTests.ts b/packages/app/src/setupTests.ts index 2e8ee02ca..18dccb078 100644 --- a/packages/app/src/setupTests.ts +++ b/packages/app/src/setupTests.ts @@ -12,8 +12,8 @@ library.add(faTwitter, faGithub, faReddit, faLink); jest.mock("loglevel", () => ({ info: jest.fn(), - log: jest.fn(), debug: jest.fn(), + log: jest.fn(), warn: jest.fn(), error: jest.fn(), })); diff --git a/packages/providers/src/index.ts b/packages/providers/src/index.ts index 4600c2608..5743fd8db 100644 --- a/packages/providers/src/index.ts +++ b/packages/providers/src/index.ts @@ -1,2 +1,2 @@ -export { CryptKeeperInjectedProvider, initializeCryptKeeperProvider, cryptkeeperConnect } from "./sdk"; export { RPCAction } from "./constants"; +export { CryptKeeperInjectedProvider, initializeCryptKeeperProvider, cryptkeeperConnect } from "./sdk";