diff --git a/.github/workflows/manual_npm_publishl.yml b/.github/workflows/manual_npm_publishl.yml index ebb9eedb..e301f4db 100644 --- a/.github/workflows/manual_npm_publishl.yml +++ b/.github/workflows/manual_npm_publishl.yml @@ -25,11 +25,7 @@ jobs: node-version: ${{ matrix.node-version }} registry-url: 'https://npm.pkg.github.com' - run: yarn - env: - NODE_AUTH_TOKEN: ${{ secrets.PAT_PACKAGES }} - name: Run yarn build - env: - NODE_AUTH_TOKEN: ${{ secrets.PAT_PACKAGES }} run: | yarn build - name: Configure git.vdb.to npm registry diff --git a/.github/workflows/on-main.yaml b/.github/workflows/on-main.yaml index 6c6fd85b..c5b293e4 100644 --- a/.github/workflows/on-main.yaml +++ b/.github/workflows/on-main.yaml @@ -19,11 +19,6 @@ jobs: node-version: ${{ matrix.node-version }} registry-url: 'https://npm.pkg.github.com' - run: yarn - # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#use-private-packages - env: - # GITHUB_TOKEN can't access packages from other private repositories. - # https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-npm-registry#authenticating-to-github-packages - NODE_AUTH_TOKEN: ${{ secrets.PAT_PACKAGES }} - name: Linter check run: yarn lint test: @@ -39,11 +34,7 @@ jobs: node-version: ${{ matrix.node-version }} registry-url: 'https://npm.pkg.github.com' - run: yarn - env: - NODE_AUTH_TOKEN: ${{ secrets.PAT_PACKAGES }} - name: Run tests - env: - NODE_AUTH_TOKEN: ${{ secrets.PAT_PACKAGES }} run: | yarn build yarn test:init @@ -60,8 +51,6 @@ jobs: echo ::set-output name=repo::$(echo ${{ github.repository }}) - name: Run docker build run: make docker-build - env: - NPM_AUTH_TOKEN: ${{ secrets.PAT_PACKAGES }} - name: Tag docker image run: docker tag ${{steps.vars.outputs.repo}} ghcr.io/${{steps.vars.outputs.repo}}:${{steps.vars.outputs.sha}} - name: Docker Login diff --git a/.github/workflows/on-pr.yaml b/.github/workflows/on-pr.yaml index 004a1b2e..8d081a20 100644 --- a/.github/workflows/on-pr.yaml +++ b/.github/workflows/on-pr.yaml @@ -16,11 +16,6 @@ jobs: node-version: ${{ matrix.node-version }} registry-url: 'https://npm.pkg.github.com' - run: yarn - # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#use-private-packages - env: - # GITHUB_TOKEN can't access packages from other private repositories. - # https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-npm-registry#authenticating-to-github-packages - NODE_AUTH_TOKEN: ${{ secrets.PAT_PACKAGES }} - name: Linter check run: yarn lint test: @@ -36,11 +31,7 @@ jobs: node-version: ${{ matrix.node-version }} registry-url: 'https://npm.pkg.github.com' - run: yarn - env: - NODE_AUTH_TOKEN: ${{ secrets.PAT_PACKAGES }} - name: Run tests - env: - NODE_AUTH_TOKEN: ${{ secrets.PAT_PACKAGES }} run: | yarn build yarn test:init @@ -53,5 +44,3 @@ jobs: - uses: actions/checkout@v2 - name: Run docker build run: make docker-build - env: - NPM_AUTH_TOKEN: ${{ secrets.PAT_PACKAGES }} diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 698d2c1c..4fa77067 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -37,11 +37,7 @@ jobs: node-version: ${{ matrix.node-version }} registry-url: 'https://npm.pkg.github.com' - run: yarn - env: - NODE_AUTH_TOKEN: ${{ secrets.PAT_PACKAGES }} - name: Run yarn build - env: - NODE_AUTH_TOKEN: ${{ secrets.PAT_PACKAGES }} run: | yarn build - name: Configure git.vdb.to npm registry diff --git a/.npmrc b/.npmrc index db6784df..5bb53340 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1 @@ registry=https://git.vdb.to/api/packages/cerc-io/npm/ -@vulcanize:registry=https://npm.pkg.github.com diff --git a/Dockerfile b/Dockerfile index b83d034f..7240f047 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,7 @@ FROM node:16.13.1-alpine3.14 -ARG NPM_AUTH_TOKEN WORKDIR /app COPY . . -RUN echo //npm.pkg.github.com/:_authToken=$NPM_AUTH_TOKEN > ~/.npmrc - RUN apk --update --no-cache add git && yarn diff --git a/packages/graph-node/test/subgraph/example1/.npmrc b/packages/graph-node/test/subgraph/example1/.npmrc index 24100685..3082f502 100644 --- a/packages/graph-node/test/subgraph/example1/.npmrc +++ b/packages/graph-node/test/subgraph/example1/.npmrc @@ -1 +1 @@ -@graphprotocol:registry=https://npm.pkg.github.com +@cerc-io:registry=https://git.vdb.to/api/packages/cerc-io/npm/ \ No newline at end of file diff --git a/packages/graph-node/test/subgraph/example1/package.json b/packages/graph-node/test/subgraph/example1/package.json index 6f81c051..13e0a6b8 100644 --- a/packages/graph-node/test/subgraph/example1/package.json +++ b/packages/graph-node/test/subgraph/example1/package.json @@ -10,7 +10,7 @@ "deploy-local": "graph deploy --node http://localhost:8020/ --ipfs http://localhost:5001 example1" }, "dependencies": { - "@graphprotocol/graph-ts": "npm:@vulcanize/graph-ts@0.22.2", - "@vulcanize/graph-cli": "0.22.5" + "@graphprotocol/graph-ts": "npm:@cerc-io/graph-ts@0.22.1-watcher-ts-0.1.0", + "@cerc-io/graph-cli": "0.22.4-watcher-ts-0.1.0" } } diff --git a/packages/graph-node/test/subgraph/example1/yarn.lock b/packages/graph-node/test/subgraph/example1/yarn.lock index f0a34df6..51c22456 100644 --- a/packages/graph-node/test/subgraph/example1/yarn.lock +++ b/packages/graph-node/test/subgraph/example1/yarn.lock @@ -23,10 +23,39 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@graphprotocol/graph-ts@npm:@vulcanize/graph-ts@0.22.2": - version "0.22.2" - resolved "https://npm.pkg.github.com/download/@vulcanize/graph-ts/0.22.2/a403a4ef6a5742246c4a1c97695a2f55943eb3a7#a403a4ef6a5742246c4a1c97695a2f55943eb3a7" - integrity sha512-Fscv1owyoeAkS9QsLGXOalMZlb3j0Ge22z+wmpqA6zJHRiSUyyIyiarSz6e0ZTs761oFqqvt00dR6A/4xxf40A== +"@cerc-io/graph-cli@0.22.4-watcher-ts-0.1.0": + version "0.22.4-watcher-ts-0.1.0" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fgraph-cli/-/0.22.4-watcher-ts-0.1.0/graph-cli-0.22.4-watcher-ts-0.1.0.tgz#2a5ce10ae15352bee4573466fadaf50f842e8fcd" + integrity sha512-gzUOGEc0zT3XO3+9WyJ5GlPZvdjLd5ttsTxwNXnI2qZnDWUqnEnNIXXieglKeXjf6Y6CLToJpKAx7Hf/HGkeNw== + dependencies: + assemblyscript "0.19.10" + binary-install-raw "0.0.13" + chalk "^3.0.0" + chokidar "^3.0.2" + debug "^4.1.1" + docker-compose "^0.23.2" + dockerode "^2.5.8" + fs-extra "^9.0.0" + glob "^7.1.2" + gluegun "^4.3.1" + graphql "^15.5.0" + immutable "^3.8.2" + ipfs-http-client "^34.0.0" + jayson "^3.0.2" + js-yaml "^3.13.1" + node-fetch "^2.3.0" + pkginfo "^0.4.1" + prettier "^1.13.5" + request "^2.88.0" + semver "7.3.5" + tmp-promise "^3.0.2" + which "2.0.2" + yaml "^1.5.1" + +"@graphprotocol/graph-ts@npm:@cerc-io/graph-ts@0.22.1-watcher-ts-0.1.0": + version "0.22.1-watcher-ts-0.1.0" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fgraph-ts/-/0.22.1-watcher-ts-0.1.0/graph-ts-0.22.1-watcher-ts-0.1.0.tgz#a8813ce6eb8dcc8f689a422a493276a923084854" + integrity sha512-YBCaCgr0POeEs4McF6CZa0W5J52x3GgToJWfMyJOtBdk68vnxk/fd+1z4qLNT48xAPlWFOrebunNOnFCF3LJOw== dependencies: assemblyscript "0.19.10" @@ -83,35 +112,6 @@ dependencies: "@types/node" "*" -"@vulcanize/graph-cli@0.22.5": - version "0.22.5" - resolved "https://npm.pkg.github.com/download/@vulcanize/graph-cli/0.22.5/32a7a7d38277ce99a49692538476c5290b296288ef5e770437536900874d423a#8718ad790abbec32b465a24147e0bbbca5e95fcd" - integrity sha512-wvTF7pF1NQwCAS40JXSVQcXZRt2gmyN4DsHA8SZLSlkxR1ZXCIOC/74cZW0fuIf/WvUO2knBURQMHykyvgD2Og== - dependencies: - assemblyscript "0.19.10" - binary-install-raw "0.0.13" - chalk "^3.0.0" - chokidar "^3.0.2" - debug "^4.1.1" - docker-compose "^0.23.2" - dockerode "^2.5.8" - fs-extra "^9.0.0" - glob "^7.1.2" - gluegun "^4.3.1" - graphql "^15.5.0" - immutable "^3.8.2" - ipfs-http-client "^34.0.0" - jayson "^3.0.2" - js-yaml "^3.13.1" - node-fetch "^2.3.0" - pkginfo "^0.4.1" - prettier "^1.13.5" - request "^2.88.0" - semver "7.3.5" - tmp-promise "^3.0.2" - which "2.0.2" - yaml "^1.5.1" - JSONStream@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"