From c530f5681c4a0ecb50837e66c6f6a7f0824234d4 Mon Sep 17 00:00:00 2001 From: Guillaume Vincent Date: Mon, 20 Dec 2021 21:02:34 +0100 Subject: [PATCH] Fix CI --- .github/workflows/containers-test.yml | 8 +------- .github/workflows/lesspass-crypto-publish.yml | 5 ++++- .github/workflows/lesspass-crypto-test.yml | 8 +------- .github/workflows/lesspass-entropy-publish.yml | 5 ++++- .github/workflows/lesspass-entropy-test.yml | 9 ++------- .github/workflows/lesspass-fingerprint-publish.yml | 6 ++++-- .github/workflows/lesspass-fingerprint-test.yml | 10 +++------- .github/workflows/lesspass-publish.yml | 5 ++++- .github/workflows/lesspass-pure-publish.yml | 6 +++++- .github/workflows/lesspass-pure-test.yml | 9 ++------- .github/workflows/lesspass-render-password-publish.yml | 5 ++++- .github/workflows/lesspass-render-password-test.yml | 8 +------- .github/workflows/lesspass-test.yml | 8 +------- .github/workflows/lesspass-web-extension-publish.yml | 6 +++--- .github/workflows/lesspass-web-extension-test.yml | 8 +------- package.json | 3 +-- packages/lesspass-entropy/package.json | 2 +- packages/lesspass-fingerprint/package.json | 2 +- packages/lesspass-pure/package.json | 2 +- packages/lesspass-web-extension/amo.md | 2 +- packages/lesspass-web-extension/package.json | 2 +- 21 files changed, 46 insertions(+), 73 deletions(-) diff --git a/.github/workflows/containers-test.yml b/.github/workflows/containers-test.yml index 0bead1d..bea5fcc 100644 --- a/.github/workflows/containers-test.yml +++ b/.github/workflows/containers-test.yml @@ -22,18 +22,12 @@ jobs: python -m pip install -r requirements.txt python manage.py test test-site: - name: Node.js ${{ matrix.node-version }} runs-on: ubuntu-18.04 - strategy: - matrix: - node-version: - - "14" - - "16" steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: - node-version: ${{ matrix.node-version }} + node-version: "14" - run: yarn install - run: yarn workspace lesspass-site run test test-integration: diff --git a/.github/workflows/lesspass-crypto-publish.yml b/.github/workflows/lesspass-crypto-publish.yml index 3d1c94b..f12ad7d 100644 --- a/.github/workflows/lesspass-crypto-publish.yml +++ b/.github/workflows/lesspass-crypto-publish.yml @@ -7,6 +7,7 @@ on: - completed jobs: publish: + if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 @@ -16,7 +17,9 @@ jobs: registry-url: "https://registry.npmjs.org" - run: yarn install - run: yarn workspace lesspass-crypto run build - - run: yarn workspace lesspass-crypto run publish + - run: | + cd packages/lesspass-crypto + yarn publish --non-interactive continue-on-error: true env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/lesspass-crypto-test.yml b/.github/workflows/lesspass-crypto-test.yml index c75da35..aa894f2 100644 --- a/.github/workflows/lesspass-crypto-test.yml +++ b/.github/workflows/lesspass-crypto-test.yml @@ -8,17 +8,11 @@ on: - "packages/lesspass-crypto/**" jobs: test: - name: Node.js ${{ matrix.node-version }} runs-on: ubuntu-18.04 - strategy: - matrix: - node-version: - - "14" - - "16" steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: - node-version: ${{ matrix.node-version }} + node-version: "14" - run: yarn install - run: yarn workspace lesspass-crypto run test diff --git a/.github/workflows/lesspass-entropy-publish.yml b/.github/workflows/lesspass-entropy-publish.yml index 1d79d76..5ec57fd 100644 --- a/.github/workflows/lesspass-entropy-publish.yml +++ b/.github/workflows/lesspass-entropy-publish.yml @@ -7,6 +7,7 @@ on: - completed jobs: publish: + if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 @@ -15,7 +16,9 @@ jobs: node-version: "14" registry-url: "https://registry.npmjs.org" - run: yarn install - - run: yarn workspace lesspass-entropy run publish + - run: | + cd packages/lesspass-entropy + yarn publish --non-interactive continue-on-error: true env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/lesspass-entropy-test.yml b/.github/workflows/lesspass-entropy-test.yml index 74ca268..196c91d 100644 --- a/.github/workflows/lesspass-entropy-test.yml +++ b/.github/workflows/lesspass-entropy-test.yml @@ -8,17 +8,12 @@ on: - "packages/lesspass-entropy/**" jobs: test: - name: Node.js ${{ matrix.node-version }} runs-on: ubuntu-18.04 - strategy: - matrix: - node-version: - - "14" - - "16" steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: - node-version: ${{ matrix.node-version }} + node-version: "14" - run: yarn install + - run: yarn workspace lesspass-crypto run build - run: yarn workspace lesspass-entropy run test diff --git a/.github/workflows/lesspass-fingerprint-publish.yml b/.github/workflows/lesspass-fingerprint-publish.yml index 8ac713c..ff82211 100644 --- a/.github/workflows/lesspass-fingerprint-publish.yml +++ b/.github/workflows/lesspass-fingerprint-publish.yml @@ -7,6 +7,7 @@ on: - completed jobs: publish: + if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 @@ -15,8 +16,9 @@ jobs: node-version: "14" registry-url: "https://registry.npmjs.org" - run: yarn install - - run: yarn workspace lesspass-fingerprint run build - - run: yarn workspace lesspass-fingerprint run publish + - run: | + cd packages/lesspass-fingerprint + yarn publish --non-interactive continue-on-error: true env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/lesspass-fingerprint-test.yml b/.github/workflows/lesspass-fingerprint-test.yml index 6eeac9b..8401b34 100644 --- a/.github/workflows/lesspass-fingerprint-test.yml +++ b/.github/workflows/lesspass-fingerprint-test.yml @@ -8,17 +8,13 @@ on: - "packages/lesspass-fingerprint/**" jobs: test: - name: Node.js ${{ matrix.node-version }} runs-on: ubuntu-18.04 - strategy: - matrix: - node-version: - - "14" - - "16" steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: - node-version: ${{ matrix.node-version }} + node-version: "14" + registry-url: "https://registry.npmjs.org" - run: yarn install + - run: yarn workspace lesspass-crypto run build - run: yarn workspace lesspass-fingerprint run test diff --git a/.github/workflows/lesspass-publish.yml b/.github/workflows/lesspass-publish.yml index 06c10bc..dd2ba94 100644 --- a/.github/workflows/lesspass-publish.yml +++ b/.github/workflows/lesspass-publish.yml @@ -7,6 +7,7 @@ on: - completed jobs: publish: + if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 @@ -15,7 +16,9 @@ jobs: node-version: "14" registry-url: "https://registry.npmjs.org" - run: yarn install - - run: yarn workspace lesspass run publish + - run: | + cd packages/lesspass + yarn publish --non-interactive continue-on-error: true env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/lesspass-pure-publish.yml b/.github/workflows/lesspass-pure-publish.yml index 070244c..7c9d321 100644 --- a/.github/workflows/lesspass-pure-publish.yml +++ b/.github/workflows/lesspass-pure-publish.yml @@ -7,6 +7,7 @@ on: - completed jobs: publish: + if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 @@ -15,8 +16,11 @@ jobs: node-version: "14" registry-url: "https://registry.npmjs.org" - run: yarn install + - run: yarn workspace lesspass-crypto run build - run: yarn workspace lesspass-pure run build - - run: yarn workspace lesspass-pure run publish + - run: | + cd packages/lesspass-pure + yarn publish --non-interactive continue-on-error: true env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/lesspass-pure-test.yml b/.github/workflows/lesspass-pure-test.yml index aa92e95..ddf4716 100644 --- a/.github/workflows/lesspass-pure-test.yml +++ b/.github/workflows/lesspass-pure-test.yml @@ -8,17 +8,12 @@ on: - "packages/lesspass-pure/**" jobs: test: - name: Node.js ${{ matrix.node-version }} runs-on: ubuntu-18.04 - strategy: - matrix: - node-version: - - "14" - - "16" steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: - node-version: ${{ matrix.node-version }} + node-version: "14" - run: yarn install + - run: yarn workspace lesspass-crypto run build - run: yarn workspace lesspass-pure run test diff --git a/.github/workflows/lesspass-render-password-publish.yml b/.github/workflows/lesspass-render-password-publish.yml index 19f1853..bf2a1ac 100644 --- a/.github/workflows/lesspass-render-password-publish.yml +++ b/.github/workflows/lesspass-render-password-publish.yml @@ -7,6 +7,7 @@ on: - completed jobs: publish: + if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 @@ -15,7 +16,9 @@ jobs: node-version: "14" registry-url: "https://registry.npmjs.org" - run: yarn install - - run: yarn workspace lesspass-render-password run publish + - run: | + cd packages/lesspass-render-password + yarn publish --non-interactive continue-on-error: true env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/lesspass-render-password-test.yml b/.github/workflows/lesspass-render-password-test.yml index 7060b52..3e6f615 100644 --- a/.github/workflows/lesspass-render-password-test.yml +++ b/.github/workflows/lesspass-render-password-test.yml @@ -8,17 +8,11 @@ on: - "packages/lesspass-render-password/**" jobs: test: - name: Node.js ${{ matrix.node-version }} runs-on: ubuntu-18.04 - strategy: - matrix: - node-version: - - "14" - - "16" steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: - node-version: ${{ matrix.node-version }} + node-version: "14" - run: yarn install - run: yarn workspace lesspass-render-password run test diff --git a/.github/workflows/lesspass-test.yml b/.github/workflows/lesspass-test.yml index 09fac8e..f82f263 100644 --- a/.github/workflows/lesspass-test.yml +++ b/.github/workflows/lesspass-test.yml @@ -8,17 +8,11 @@ on: - "packages/lesspass/**" jobs: test: - name: Node.js ${{ matrix.node-version }} runs-on: ubuntu-18.04 - strategy: - matrix: - node-version: - - "14" - - "16" steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: - node-version: ${{ matrix.node-version }} + node-version: "14" - run: yarn install - run: yarn workspace lesspass run test diff --git a/.github/workflows/lesspass-web-extension-publish.yml b/.github/workflows/lesspass-web-extension-publish.yml index d1b990f..5de592c 100644 --- a/.github/workflows/lesspass-web-extension-publish.yml +++ b/.github/workflows/lesspass-web-extension-publish.yml @@ -7,6 +7,7 @@ on: - completed jobs: publish: + if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 @@ -14,9 +15,8 @@ jobs: with: node-version: "14" - run: yarn install - - run: yarn --version - - run: ls packages/lesspass-web-extension/node_modules - - run: ls packages/lesspass-web-extension/node_modules/lesspass-pure + - run: yarn workspace lesspass-crypto run build + - run: yarn workspace lesspass-pure run build - run: yarn workspace lesspass-web-extension run build - run: yarn workspace lesspass-web-extension run release continue-on-error: true diff --git a/.github/workflows/lesspass-web-extension-test.yml b/.github/workflows/lesspass-web-extension-test.yml index 926af48..bd989db 100644 --- a/.github/workflows/lesspass-web-extension-test.yml +++ b/.github/workflows/lesspass-web-extension-test.yml @@ -8,17 +8,11 @@ on: - "packages/lesspass-web-extension/**" jobs: test: - name: Node.js ${{ matrix.node-version }} runs-on: ubuntu-18.04 - strategy: - matrix: - node-version: - - "14" - - "16" steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: - node-version: ${{ matrix.node-version }} + node-version: "14" - run: yarn install - run: yarn workspace lesspass-web-extension run test diff --git a/package.json b/package.json index f21b8db..fa0c7d9 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,7 @@ "packages/*" ], "nohoist": [ - "**/lesspass-pure", - "**/lesspass-pure/**" + "**/lesspass-pure" ] }, "devDependencies": { diff --git a/packages/lesspass-entropy/package.json b/packages/lesspass-entropy/package.json index 799add5..56dae8e 100644 --- a/packages/lesspass-entropy/package.json +++ b/packages/lesspass-entropy/package.json @@ -12,7 +12,7 @@ "./src/pbkdf2.js": "./src/pbkdf2.browser.js" }, "scripts": { - "test": "npm run test:unit && npm run test:browser", + "test": "yarn test:unit && yarn test:browser", "test:unit": "mocha test --recursive", "test:browser": "karma start test/karma.conf.js" }, diff --git a/packages/lesspass-fingerprint/package.json b/packages/lesspass-fingerprint/package.json index 5a0b327..986032c 100644 --- a/packages/lesspass-fingerprint/package.json +++ b/packages/lesspass-fingerprint/package.json @@ -12,7 +12,7 @@ "./src/hmac.js": "./src/hmac.browser.js" }, "scripts": { - "test": "npm run test:unit && npm run test:browser", + "test": "yarn test:unit && yarn test:browser", "test:unit": "mocha test --recursive", "test:browser": "karma start test/karma.conf.js" }, diff --git a/packages/lesspass-pure/package.json b/packages/lesspass-pure/package.json index b617750..3097b79 100644 --- a/packages/lesspass-pure/package.json +++ b/packages/lesspass-pure/package.json @@ -10,7 +10,7 @@ "i18n:build": "node src/i18n/build.js", "i18n:translate": "node src/i18n/translate.js", "prettier": "prettier --write 'src/**/*'", - "test": "npm run test:unit && npm run test:e2e", + "test": "yarn test:unit && yarn test:e2e", "test:watch": "jest --watch", "test:unit": "vue-cli-service test:unit", "test:e2e": "vue-cli-service test:e2e --headless", diff --git a/packages/lesspass-web-extension/amo.md b/packages/lesspass-web-extension/amo.md index 3f33450..7d1fdff 100644 --- a/packages/lesspass-web-extension/amo.md +++ b/packages/lesspass-web-extension/amo.md @@ -2,7 +2,7 @@ ## Verify the web extension -The web extension is just a wrapper around lesspass-pure on npm. +The web extension is just a wrapper around lesspass-pure node module. Source file correspond to the zip downloaded on http://github.com/lesspass/lesspass/archive/${sha256}.zip. {sha256} is the git sha256 use when build was done. diff --git a/packages/lesspass-web-extension/package.json b/packages/lesspass-web-extension/package.json index 91e5409..2826e19 100644 --- a/packages/lesspass-web-extension/package.json +++ b/packages/lesspass-web-extension/package.json @@ -8,7 +8,7 @@ "start": "cd extension && web-ext run", "build": "rm -rf ./extension/dist && mkdir ./extension/dist && cp -r ./node_modules/lesspass-pure/dist/ ./extension", "test": "echo 0", - "release": "npm run release:amo && npm run release:cws", + "release": "yarn release:amo && yarn release:cws", "release:amo": "cd extension && web-ext-submit", "release:cws": "cd extension && webstore upload --auto-publish" },