diff --git a/.github/actions/ci/action.yml b/.github/actions/ci/action.yml index 51e2636..31f8a67 100644 --- a/.github/actions/ci/action.yml +++ b/.github/actions/ci/action.yml @@ -42,12 +42,12 @@ runs: - name: Build JS API shell: bash run: | - cd api/sdkmeta-js && npm install && npx publint + cd api-js && npm install && npx publint - name: Test JS API shell: bash run: | - cd api/sdkmeta-js && npm test + cd api-js && npm test - name: Sanity test ingestion shell: bash diff --git a/.github/actions/publish-npm/action.yml b/.github/actions/publish-npm/action.yml index 3d25f2d..4b33f59 100644 --- a/.github/actions/publish-npm/action.yml +++ b/.github/actions/publish-npm/action.yml @@ -26,5 +26,5 @@ runs: LD_RELEASE_IS_DRYRUN: ${{ inputs.dry_run }} shell: bash run: | - cd api/sdkmeta-js + cd api-js ./scripts/publish.sh diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 28c5bfa..4fe80c8 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -9,7 +9,25 @@ on: jobs: release-please: runs-on: ubuntu-latest + outputs: + package-api-js-released: ${{ steps.release.outputs['api-js--release_created'] }} steps: - uses: googleapis/release-please-action@v4 + id: release with: token: ${{ secrets.GITHUB_TOKEN }} + + release-npm: + runs-on: ubuntu-latest + needs: release-please + permissions: + id-token: write + contents: write + if: ${{ needs.release-please.outputs.package-api-js-released == 'true' }} + steps: + - uses: actions/checkout@v4 + - uses: ./.github/actions/publish-npm + with: + prerelease: true + dry_run: false + aws_assume_role: ${{ vars.AWS_ROLE_ARN }} diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 15ac1b1..b20ee27 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,4 @@ { - "api": "0.3.2" + "api": "0.3.2", + "api-js": "0.0.4" } diff --git a/api/sdkmeta-js/.gitignore b/api-js/.gitignore similarity index 100% rename from api/sdkmeta-js/.gitignore rename to api-js/.gitignore diff --git a/api/sdkmeta-js/jest.config.json b/api-js/jest.config.json similarity index 100% rename from api/sdkmeta-js/jest.config.json rename to api-js/jest.config.json diff --git a/api/sdkmeta-js/package.json b/api-js/package.json similarity index 100% rename from api/sdkmeta-js/package.json rename to api-js/package.json diff --git a/api/sdkmeta-js/scripts/publish.sh b/api-js/scripts/publish.sh similarity index 100% rename from api/sdkmeta-js/scripts/publish.sh rename to api-js/scripts/publish.sh diff --git a/api/sdkmeta-js/src/SDKMeta.ts b/api-js/src/SDKMeta.ts similarity index 100% rename from api/sdkmeta-js/src/SDKMeta.ts rename to api-js/src/SDKMeta.ts diff --git a/api/sdkmeta-js/src/data/feature_info.json b/api-js/src/data/feature_info.json similarity index 100% rename from api/sdkmeta-js/src/data/feature_info.json rename to api-js/src/data/feature_info.json diff --git a/api/sdkmeta-js/src/data/features.json b/api-js/src/data/features.json similarity index 100% rename from api/sdkmeta-js/src/data/features.json rename to api-js/src/data/features.json diff --git a/api/sdkmeta-js/src/data/languages.json b/api-js/src/data/languages.json similarity index 100% rename from api/sdkmeta-js/src/data/languages.json rename to api-js/src/data/languages.json diff --git a/api/sdkmeta-js/src/data/names.json b/api-js/src/data/names.json similarity index 100% rename from api/sdkmeta-js/src/data/names.json rename to api-js/src/data/names.json diff --git a/api/sdkmeta-js/src/data/popularity.json b/api-js/src/data/popularity.json similarity index 100% rename from api/sdkmeta-js/src/data/popularity.json rename to api-js/src/data/popularity.json diff --git a/api/sdkmeta-js/src/data/releases.json b/api-js/src/data/releases.json similarity index 100% rename from api/sdkmeta-js/src/data/releases.json rename to api-js/src/data/releases.json diff --git a/api/sdkmeta-js/src/data/repos.json b/api-js/src/data/repos.json similarity index 100% rename from api/sdkmeta-js/src/data/repos.json rename to api-js/src/data/repos.json diff --git a/api/sdkmeta-js/src/data/types.json b/api-js/src/data/types.json similarity index 100% rename from api/sdkmeta-js/src/data/types.json rename to api-js/src/data/types.json diff --git a/api/sdkmeta-js/tests/e2e.test.ts b/api-js/tests/e2e.test.ts similarity index 100% rename from api/sdkmeta-js/tests/e2e.test.ts rename to api-js/tests/e2e.test.ts diff --git a/api/sdkmeta-js/tsconfig.json b/api-js/tsconfig.json similarity index 100% rename from api/sdkmeta-js/tsconfig.json rename to api-js/tsconfig.json diff --git a/api/sdkmeta-js/tsconfig.test.json b/api-js/tsconfig.test.json similarity index 100% rename from api/sdkmeta-js/tsconfig.test.json rename to api-js/tsconfig.test.json diff --git a/api/sdkmeta-js/tsup.config.ts b/api-js/tsup.config.ts similarity index 100% rename from api/sdkmeta-js/tsup.config.ts rename to api-js/tsup.config.ts diff --git a/release-please-config.json b/release-please-config.json index 98d829f..72c4d86 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -9,6 +9,12 @@ "release-type" : "go", "tag-separator": "/", "versioning" : "default" + }, + "api-js" : { + "package-name": "api-js", + "release-type" : "node", + "tag-separator": "/", + "versioning" : "default" } } } diff --git a/scripts/generate-products.sh b/scripts/generate-products.sh index 02f6b30..5de0595 100755 --- a/scripts/generate-products.sh +++ b/scripts/generate-products.sh @@ -9,7 +9,7 @@ set -e # Cleanup existing products so we have a clean slate. rm products/*.json rm api/sdkmeta/data/*.json -rm api/sdkmeta-js/src/data/*.json +rm api-js/src/data/*.json sqlite3 -json metadata.sqlite3 "SELECT * from sdk_languages;" | jq -S 'reduce .[] as $item ({}; .[$item.id] += [$item.language])' > products/languages.json @@ -40,4 +40,4 @@ sqlite3 -json metadata.sqlite3 "SELECT * from sdk_popularity;" | cp products/*.json api/sdkmeta/data/ # Same for the Typescript module. -cp products/*.json api/sdkmeta-js/src/data/ +cp products/*.json api-js/src/data/