diff --git a/.gitea/workflows/default_nottags.yaml b/.gitea/workflows/default_nottags.yaml index 0bae651..2a8c8b4 100644 --- a/.gitea/workflows/default_nottags.yaml +++ b/.gitea/workflows/default_nottags.yaml @@ -23,24 +23,16 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Install pnpm and npmci - run: | - pnpm install -g pnpm - pnpm install -g @ship.zone/npmci - - - name: Run npm prepare - run: npmci npm prepare - - name: Audit production dependencies run: | - npmci command npm config set registry https://registry.npmjs.org - npmci command pnpm audit --audit-level=high --prod + npm config set registry https://registry.npmjs.org + pnpm audit --audit-level=high --prod continue-on-error: true - name: Audit development dependencies run: | - npmci command npm config set registry https://registry.npmjs.org - npmci command pnpm audit --audit-level=high --dev + npm config set registry https://registry.npmjs.org + pnpm audit --audit-level=high --dev continue-on-error: true test: @@ -55,12 +47,10 @@ jobs: - name: Test stable run: | - npmci node install stable - npmci npm install - npmci npm test + pnpm install + pnpm test - name: Test build run: | - npmci node install stable - npmci npm install - npmci npm build + pnpm install + pnpm build diff --git a/.gitea/workflows/default_tags.yaml b/.gitea/workflows/default_tags.yaml index 31fbcdb..2c8ac39 100644 --- a/.gitea/workflows/default_tags.yaml +++ b/.gitea/workflows/default_tags.yaml @@ -23,22 +23,16 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Prepare - run: | - pnpm install -g pnpm - pnpm install -g @ship.zone/npmci - npmci npm prepare - - name: Audit production dependencies run: | - npmci command npm config set registry https://registry.npmjs.org - npmci command pnpm audit --audit-level=high --prod + npm config set registry https://registry.npmjs.org + pnpm audit --audit-level=high --prod continue-on-error: true - name: Audit development dependencies run: | - npmci command npm config set registry https://registry.npmjs.org - npmci command pnpm audit --audit-level=high --dev + npm config set registry https://registry.npmjs.org + pnpm audit --audit-level=high --dev continue-on-error: true test: @@ -51,23 +45,15 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Prepare - run: | - pnpm install -g pnpm - pnpm install -g @ship.zone/npmci - npmci npm prepare - - name: Test stable run: | - npmci node install stable - npmci npm install - npmci npm test + pnpm install + pnpm test - name: Test build run: | - npmci node install stable - npmci npm install - npmci npm build + pnpm install + pnpm build release: needs: test @@ -79,28 +65,22 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Prepare - run: | - pnpm install -g pnpm - pnpm install -g @ship.zone/npmci - npmci npm prepare - - name: Release run: | - npmci node install stable - npmci npm install + pnpm install # Extract server host from GITHUB_SERVER_URL (remove https://) GITEA_HOST="${GITHUB_SERVER_URL#https://}" GITEA_REGISTRY="$GITHUB_SERVER_URL/api/packages/$GITHUB_REPOSITORY_OWNER/npm/" # Configure Gitea npm registry - npmci command npm config set @${GITHUB_REPOSITORY_OWNER}:registry "$GITEA_REGISTRY" - npmci command npm config set "//${GITEA_HOST}/api/packages/${GITHUB_REPOSITORY_OWNER}/npm/:_authToken" "$GITEA_TOKEN" + npm config set @${GITHUB_REPOSITORY_OWNER}:registry "$GITEA_REGISTRY" + npm config set "//${GITEA_HOST}/api/packages/${GITHUB_REPOSITORY_OWNER}/npm/:_authToken" "$GITEA_TOKEN" # Publish to Gitea - npmci command npm publish + pnpm publish --no-git-checks # Conditionally publish to npmjs.org if token exists if [ -n "$NPMCI_TOKEN_NPM" ]; then - npmci command npm config set registry https://registry.npmjs.org - npmci npm publish + npm config set registry https://registry.npmjs.org + npm config set //registry.npmjs.org/:_authToken "$NPMCI_TOKEN_NPM" + pnpm publish --no-git-checks fi metadata: @@ -114,24 +94,14 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Prepare - run: | - pnpm install -g pnpm - pnpm install -g @ship.zone/npmci - npmci npm prepare - - name: Code quality run: | - npmci command npm install -g typescript - npmci npm install - - - name: Trigger - run: npmci trigger + npm install -g typescript + pnpm install - name: Build docs and upload artifacts run: | - npmci node install stable - npmci npm install + pnpm install pnpm install -g @git.zone/tsdoc - npmci command tsdoc + tsdoc continue-on-error: true diff --git a/changelog.md b/changelog.md index 446a35e..0b1ba11 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,15 @@ # Changelog +## 2025-10-26 - 4.3.5 - fix(workflows) +Remove npmci wrappers from CI workflows and use pnpm/npm CLI directly + +- Removed global npmci installation and npmci npm prepare steps from Gitea workflow files +- Use pnpm install/test/build instead of npmci-wrapped commands in test jobs +- Replace npmci command npm config set ... with direct npm config set calls for registry/auth configuration +- Use pnpm publish --no-git-checks for Gitea publishing and use pnpm publish for conditional npmjs publish when token present +- Simplified dependency auditing to run pnpm audit and set registry via npm config set +- Install tsdoc globally and run tsdoc during docs build step (replacing npmci command usage) + ## 2025-10-25 - 4.3.4 - fix(ci) Fix Gitea workflow publish invocation to run npm publish via npmci command diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index 036182b..d1f9048 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@push.rocks/smartrequest', - version: '4.3.4', + version: '4.3.5', description: 'A module for modern HTTP/HTTPS requests with support for form data, file uploads, JSON, binary data, streams, and more.' }