Fix mainnet proposal

StrataFoundation · Dec 24, 2021 · b95d089 · b95d089
1 parent 29eb99e
commit b95d089
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/.github/workflows/mainnet-proposal.yaml b/.github/workflows/mainnet-proposal.yaml
@@ -1,9 +1,9 @@
 name: Mainnet Proposal
 
 on:
-  push:
-    tags:       
-      - 'v**'
+  release:
+    types: [published]
+
 env:
   SOLANA_CLI_VERSION: 1.8.5
   NODE_VERSION: 17.0.1
@@ -12,20 +12,39 @@ jobs:
   create-bonding-proposal:
     name: Create Bonding Proposal
     runs-on: ubuntu-18.04
-    if: github.ref == 'refs/heads/master'
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/deploy-with-gov-proposal/
         id: deploy
         with:
           program: spl_token_bonding
           program-id: TBondmkCYxaPCKG4CHYfVTcwQ8on31xnJrPzk8F8WsS
-          network: mainnet
+          network: https://api.mainnet-beta.solana.com
           keypair: ${{ secrets.DEPLOY_KEYPAIR }}
           governance: HDkW3MrrvqT9FPvuFBAVnSag1BLDx767MD2VXKfpCoCe
-          name: Deploy ${{ github.ref_name }}
-          description: https://github.com/StrataFoundation/strata/tree/${{ github.ref_name }}
+          name: Deploy ${{ event.payload.release.tag_name }}
+          description: ${{ event.payload.release.url }}
       - uses: ./.github/actions/anchor-publish/
         with:
           program: spl_token_bonding
           anchor-token: ${{ secrets.ANCHOR_TOKEN }}
+
+  create-collective-proposal:
+    name: Create Collective Proposal
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/deploy-with-gov-proposal/
+        id: deploy
+        with:
+          program: spl_token_collective
+          program-id: TCo1sfSr2nCudbeJPykbif64rG9K1JNMGzrtzvPmp3y
+          network: https://api.mainnet-beta.solana.com
+          keypair: ${{ secrets.DEPLOY_KEYPAIR }}
+          governance: 6yc2jb7LCjYXD3hbRKjYkpx13j4VXYcCBzYsZbmntdVk
+          name: Deploy ${{ event.payload.release.tag_name }}
+          description: ${{ event.payload.release.url }}
+      - uses: ./.github/actions/anchor-publish/
+        with:
+          program: spl_token_collective
+          anchor-token: ${{ secrets.ANCHOR_TOKEN }}
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -73,13 +73,15 @@ jobs:
             ${{ github.event.pull_request.body }}
           draft: false
           prerelease: false
+      - run: echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} > .npmrc
+        env:
+          NPM_TOKEN: ${{ secrets.TOKEN }}
       - name: Publish
         if: steps.tag_check.outputs.exists_tag == 'false'
         run: |
           yarn lerna publish from-package --yes --no-verify-access
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NODE_AUTH_TOKEN: ${{ secrets.TOKEN }}
       - uses: actions/github-script@v4
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}

diff --git a/packages/cli/src/createGovernanceToken.ts b/packages/cli/src/createGovernanceToken.ts
@@ -69,7 +69,7 @@ async function run(): Promise<void> {
   ]
   await createMetadata(
     new Data({
-      name: "Strata Governance",
+      name: "Strata Provisional Governance",
       symbol: "sGOV",
       uri: "",
       sellerFeeBasisPoints: 0,