From 043d6620f0f26902a562c862afb28fd15e5d01c4 Mon Sep 17 00:00:00 2001 From: Scion Date: Mon, 5 Jan 2026 10:28:13 -0800 Subject: [PATCH] Removed npm-specific version checking. --- .../gitea-query-package-versions/action.yaml | 6 +-- npm/npm-get-next-branched-version/action.yaml | 41 +++++++++++------ npm/npm-query-versions-latest/action.yaml | 46 ------------------- npm/npm-query-versions/action.yaml | 28 ----------- npm/npm-query-versions/query_versions.sh | 41 ----------------- 5 files changed, 29 insertions(+), 133 deletions(-) delete mode 100644 npm/npm-query-versions-latest/action.yaml delete mode 100644 npm/npm-query-versions/action.yaml delete mode 100644 npm/npm-query-versions/query_versions.sh diff --git a/gitea/gitea-query-package-versions/action.yaml b/gitea/gitea-query-package-versions/action.yaml index cce3bd5..61104f7 100644 --- a/gitea/gitea-query-package-versions/action.yaml +++ b/gitea/gitea-query-package-versions/action.yaml @@ -1,8 +1,8 @@ -name: github-query-nuget-versions +name: github-query-package-versions description: "Change the language format of a file." inputs: url: - description: "Url of the GitHub server repository." + description: "Url of the GitHub or Gitea server repository." required: true default: ${{ github.server_url }} organization: @@ -53,6 +53,6 @@ runs: - name: "Parse query result." id: parse uses: act/common/yq/yq-expression@master - with: + with: expression: .[] | select(.name == "${{ inputs.name }}").version input: ${{ steps.query.outputs.query }} diff --git a/npm/npm-get-next-branched-version/action.yaml b/npm/npm-get-next-branched-version/action.yaml index 539d582..c16be0e 100644 --- a/npm/npm-get-next-branched-version/action.yaml +++ b/npm/npm-get-next-branched-version/action.yaml @@ -8,13 +8,18 @@ inputs: description: "Default version to use." required: true default: "1.0.0" - registry: - description: "NPM registry URL." + url: + description: "URL of the Gitea server instance." required: false - default: ${{ github.server_url }}/api/packages/${{ github.repository_owner }}/npm/ + default: ${{ github.server_url }} + organization: + description: "Organization to search." + required: false + default: ${{ github.repository_owner }} apiKey: - description: "Authentication token for the registry." + description: "API token for Gitea." required: true + default: ${{ github.token }} prerelease: description: "Query prerelease packages. Values: true, false." required: false @@ -26,7 +31,7 @@ inputs: outputs: latestVersion: description: "The current latest version for the package." - value: ${{ steps.npm.outputs.version || steps.npmFallback.outputs.version }} + value: ${{ steps.gitea.outputs.version || steps.giteaFallback.outputs.version }} nextVersion: description: "The next version for the package." value: ${{ steps.version.outputs.nextVersion }} @@ -38,27 +43,33 @@ runs: id: base with: version: ${{ inputs.defaultVersion }} - - uses: act/common/npm/npm-query-versions-latest@master - id: npm + - uses: act/common/gitea/gitea-query-package-versions-latest@master + id: gitea with: name: ${{ inputs.name }} - registry: ${{ inputs.registry }} - apiKey: ${{ inputs.apiKey }} + url: ${{ inputs.url }} + organization: ${{ inputs.organization }} + apiToken: ${{ inputs.apiKey }} + type: npm filter: ^${{ steps.base.outputs.baseVersion }} + filterIsExpression: "true" prerelease: ${{ inputs.prerelease }} - name: "If no version is found, get the latest version for the package if we didn't already look for it." - uses: act/common/npm/npm-query-versions-latest@master - id: npmFallback - if: ${{ steps.npm.outputs.version == '' && inputs.prerelease != 'false' }} + uses: act/common/gitea/gitea-query-package-versions-latest@master + id: giteaFallback + if: ${{ steps.gitea.outputs.version == '' && inputs.prerelease != 'false' }} with: name: ${{ inputs.name }} - registry: ${{ inputs.registry }} - apiKey: ${{ inputs.apiKey }} + url: ${{ inputs.url }} + organization: ${{ inputs.organization }} + apiToken: ${{ inputs.apiKey }} + type: npm filter: ^${{ steps.base.outputs.majorMinorPatchVersion }} + filterIsExpression: "true" prerelease: "false" - name: "Get the next version for the package." uses: act/common/utils/version-increment-branch@master id: version with: incrementMode: ${{ inputs.incrementMode }} - version: ${{ steps.npm.outputs.version || steps.npmFallback.outputs.version || inputs.defaultVersion }} + version: ${{ steps.gitea.outputs.version || steps.giteaFallback.outputs.version || inputs.defaultVersion }} diff --git a/npm/npm-query-versions-latest/action.yaml b/npm/npm-query-versions-latest/action.yaml deleted file mode 100644 index 07f0fac..0000000 --- a/npm/npm-query-versions-latest/action.yaml +++ /dev/null @@ -1,46 +0,0 @@ -name: npm-query-versions-latest -description: "Get the latest version of an NPM package." -inputs: - name: - description: "Name of the package." - required: true - registry: - description: "NPM registry URL." - required: false - default: ${{ github.server_url }}/api/packages/${{ github.repository_owner }}/npm/ - apiKey: - description: "Authentication token for the registry." - required: true - prerelease: - description: "Include prerelease packages. Values: true, false." - required: false - default: "false" - filter: - description: "String to filter by." - required: false - filterIsExpression: - description: "Is the filter a Regular Expression? Values: true, false." - required: false - default: "false" -outputs: - version: - description: "The latest version of the specified package." - value: ${{ steps.parse.outputs.version }} -runs: - using: "composite" - steps: - - name: "Get versions." - id: versions - uses: act/common/npm/npm-query-versions@master - with: - name: ${{ inputs.name }} - registry: ${{ inputs.registry }} - apiKey: ${{ inputs.apiKey }} - prerelease: ${{ inputs.prerelease }} - - name: "Parse query result." - id: parse - uses: act/common/utils/get-latest-version@master - with: - versions: ${{ steps.versions.outputs.versions }} - filter: ${{ inputs.filter }} - filterIsExpression: ${{ inputs.filterIsExpression }} diff --git a/npm/npm-query-versions/action.yaml b/npm/npm-query-versions/action.yaml deleted file mode 100644 index eb24a1a..0000000 --- a/npm/npm-query-versions/action.yaml +++ /dev/null @@ -1,28 +0,0 @@ -name: npm-query-versions -description: "Get all versions of an NPM package from a registry." -inputs: - name: - description: "Name of the package." - required: true - registry: - description: "NPM registry URL." - required: false - default: ${{ github.server_url }}/api/packages/${{ github.repository_owner }}/npm/ - apiKey: - description: "Authentication token for the registry." - required: true - prerelease: - description: "Include prerelease packages. Values: true, false." - required: false - default: "false" -outputs: - versions: - description: "Newline-separated list of versions." - value: ${{ steps.query.outputs.versions }} -runs: - using: "composite" - steps: - - name: "Query NPM registry for versions." - id: query - run: bash ${{ github.action_path }}/query_versions.sh "${{ inputs.name }}" "${{ inputs.registry }}" "${{ inputs.apiKey }}" "${{ inputs.prerelease }}" - shell: bash diff --git a/npm/npm-query-versions/query_versions.sh b/npm/npm-query-versions/query_versions.sh deleted file mode 100644 index c941dc8..0000000 --- a/npm/npm-query-versions/query_versions.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -set -e - -PACKAGE_NAME="$1" -REGISTRY="$2" -AUTH_TOKEN="$3" -PRERELEASE="$4" - -if [[ ! -f "$GITHUB_OUTPUT" ]]; then - GITHUB_OUTPUT="/dev/fd/1" -fi - -# Construct the registry URL -REGISTRY_URL="$REGISTRY" - -# Build curl headers -CURL_HEADERS=(-H "Accept: application/vnd.npm.install-v1+json") -if [[ -n "$AUTH_TOKEN" ]]; then - CURL_HEADERS+=(-H "Authorization: Bearer $AUTH_TOKEN") -fi - -# Query the package metadata -RESPONSE=$(curl -sL "${CURL_HEADERS[@]}" "$REGISTRY_URL/$PACKAGE_NAME" 2>/dev/null || echo "{}") - -# Extract versions -if [[ "$PRERELEASE" == "true" ]]; then - # Get all versions - VERSIONS=$(echo "$RESPONSE" | jq -r '.versions | keys[]' 2>/dev/null || echo "") -else - # Filter out prerelease versions (those with - in them) - VERSIONS=$(echo "$RESPONSE" | jq -r '.versions | keys[] | select(contains("-") | not)' 2>/dev/null || echo "") -fi - -# Output versions separated by newlines -if [[ -n "$VERSIONS" ]]; then - echo "versions<> "$GITHUB_OUTPUT" - echo "$VERSIONS" >> "$GITHUB_OUTPUT" - echo "EOF" >> "$GITHUB_OUTPUT" -else - echo "versions=" >> "$GITHUB_OUTPUT" -fi