diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index df75f1df..1d21d965 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -23,12 +23,13 @@ jobs: env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} publish-docker: - name: Build and push Docker image uses: ./.github/workflows/docker.yml with: tag: latest + secrets: inherit deploy: needs: [publish-docker] uses: ./.github/workflows/deploy.yml with: environment: prod + secrets: inherit diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index df0a6447..33784abb 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -65,13 +65,13 @@ jobs: - name: Lint codebase run: yarn eslint --ext .js,.ts,.jsx,.tsx . docker: - name: Build and push Docker image if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || inputs.publish }} uses: ./.github/workflows/docker.yml with: tag: devel + secrets: inherit deploy: needs: [build, docker] if: @@ -80,3 +80,4 @@ jobs: uses: ./.github/workflows/deploy.yml with: environment: staging + secrets: inherit diff --git a/.github/workflows/weekly_data_reload.yml b/.github/workflows/weekly_data_reload.yml index 89f373b3..67281bc5 100644 --- a/.github/workflows/weekly_data_reload.yml +++ b/.github/workflows/weekly_data_reload.yml @@ -6,16 +6,12 @@ on: jobs: prod-cleanup: - name: Clean up prod demo server - runs-on: ubuntu-latest - steps: - - uses: ./.github/workflows/reload_demo_data.yml - with: - environment: prod + uses: ./.github/workflows/reload_demo_data.yml + with: + environment: prod + secrets: inherit staging-cleanup: - name: Clean up staging demo server - runs-on: ubuntu-latest - steps: - - uses: ./.github/workflows/reload_demo_data.yml - with: - environment: staging + uses: ./.github/workflows/reload_demo_data.yml + with: + environment: staging + secrets: inherit diff --git a/packages/apollo-cli/package.json b/packages/apollo-cli/package.json index 9c26eafb..f8970c79 100644 --- a/packages/apollo-cli/package.json +++ b/packages/apollo-cli/package.json @@ -42,7 +42,7 @@ "@oclif/plugin-help": "^6.0.8", "bson": "^6.3.0", "joi": "^17.7.0", - "open": "^9.1.0", + "open": "^10.1.0", "tslib": "^2.3.1", "undici": "^6.7.0", "yaml": "^2.3.4" diff --git a/yarn.lock b/yarn.lock index b7e11ff0..53fff676 100644 --- a/yarn.lock +++ b/yarn.lock @@ -137,7 +137,7 @@ __metadata: mocha: "npm:^10.2.0" nyc: "npm:^15.1.0" oclif: "npm:^4.4.2" - open: "npm:^9.1.0" + open: "npm:^10.1.0" shx: "npm:^0.3.3" ts-node: "npm:^10.3.0" tslib: "npm:^2.3.1" @@ -9610,6 +9610,15 @@ __metadata: languageName: node linkType: hard +"bundle-name@npm:^4.1.0": + version: 4.1.0 + resolution: "bundle-name@npm:4.1.0" + dependencies: + run-applescript: "npm:^7.0.0" + checksum: 10c0/8e575981e79c2bcf14d8b1c027a3775c095d362d1382312f444a7c861b0e21513c0bd8db5bd2b16e50ba0709fa622d4eab6b53192d222120305e68359daece29 + languageName: node + linkType: hard + "busboy@npm:^1.0.0": version: 1.6.0 resolution: "busboy@npm:1.6.0" @@ -11151,6 +11160,13 @@ __metadata: languageName: node linkType: hard +"default-browser-id@npm:^5.0.0": + version: 5.0.0 + resolution: "default-browser-id@npm:5.0.0" + checksum: 10c0/957fb886502594c8e645e812dfe93dba30ed82e8460d20ce39c53c5b0f3e2afb6ceaec2249083b90bdfbb4cb0f34e1f73fde3d68cac00becdbcfd894156b5ead + languageName: node + linkType: hard + "default-browser@npm:^4.0.0": version: 4.0.0 resolution: "default-browser@npm:4.0.0" @@ -11163,6 +11179,16 @@ __metadata: languageName: node linkType: hard +"default-browser@npm:^5.2.1": + version: 5.2.1 + resolution: "default-browser@npm:5.2.1" + dependencies: + bundle-name: "npm:^4.1.0" + default-browser-id: "npm:^5.0.0" + checksum: 10c0/73f17dc3c58026c55bb5538749597db31f9561c0193cd98604144b704a981c95a466f8ecc3c2db63d8bfd04fb0d426904834cfc91ae510c6aeb97e13c5167c4d + languageName: node + linkType: hard + "default-require-extensions@npm:^3.0.0": version: 3.0.1 resolution: "default-require-extensions@npm:3.0.1" @@ -14844,6 +14870,15 @@ __metadata: languageName: node linkType: hard +"is-wsl@npm:^3.1.0": + version: 3.1.0 + resolution: "is-wsl@npm:3.1.0" + dependencies: + is-inside-container: "npm:^1.0.0" + checksum: 10c0/d3317c11995690a32c362100225e22ba793678fe8732660c6de511ae71a0ff05b06980cf21f98a6bf40d7be0e9e9506f859abe00a1118287d63e53d0a3d06947 + languageName: node + linkType: hard + "is@npm:~0.2.6": version: 0.2.7 resolution: "is@npm:0.2.7" @@ -18146,6 +18181,18 @@ __metadata: languageName: node linkType: hard +"open@npm:^10.1.0": + version: 10.1.0 + resolution: "open@npm:10.1.0" + dependencies: + default-browser: "npm:^5.2.1" + define-lazy-prop: "npm:^3.0.0" + is-inside-container: "npm:^1.0.0" + is-wsl: "npm:^3.1.0" + checksum: 10c0/c86d0b94503d5f735f674158d5c5d339c25ec2927562f00ee74590727292ed23e1b8d9336cb41ffa7e1fa4d3641d29b199b4ea37c78cb557d72b511743e90ebb + languageName: node + linkType: hard + "open@npm:^9.1.0": version: 9.1.0 resolution: "open@npm:9.1.0" @@ -20168,6 +20215,13 @@ __metadata: languageName: node linkType: hard +"run-applescript@npm:^7.0.0": + version: 7.0.0 + resolution: "run-applescript@npm:7.0.0" + checksum: 10c0/bd821bbf154b8e6c8ecffeaf0c33cebbb78eb2987476c3f6b420d67ab4c5301faa905dec99ded76ebb3a7042b4e440189ae6d85bbbd3fc6e8d493347ecda8bfe + languageName: node + linkType: hard + "run-async@npm:^2.0.0, run-async@npm:^2.4.0": version: 2.4.1 resolution: "run-async@npm:2.4.1"