diff --git a/.github/workflows/fly.yml b/.github/workflows/fly.yml index d069d9c1..5f7d10b8 100644 --- a/.github/workflows/fly.yml +++ b/.github/workflows/fly.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@v3 - uses: superfly/flyctl-actions/setup-flyctl@master with: - version: 0.1.66 + version: 0.1.89 - id: fly_deploy run: | node buildtools/fly-deploy.js deploy @@ -59,6 +59,6 @@ jobs: - uses: actions/checkout@v3 - uses: superfly/flyctl-actions/setup-flyctl@master with: - version: 0.1.66 + version: 0.1.89 - id: fly_destroy run: node buildtools/fly-deploy.js destroy diff --git a/buildtools/fly-deploy.js b/buildtools/fly-deploy.js index 8df50687..ba115102 100644 --- a/buildtools/fly-deploy.js +++ b/buildtools/fly-deploy.js @@ -9,12 +9,12 @@ const org = "grist-labs"; const expirationSec = 30 * 24 * 60 * 60; // 30 days const getAppName = () => "grist-" + getBranchName().toLowerCase().replace(/[\W|_]+/g, '-'); -const getVolumeName = () => "grist_vol_" + getBranchName().toLowerCase().replace(/\W+/g, '_'); +const getVolumeName = () => ("gv_" + getBranchName().toLowerCase().replace(/\W+/g, '_')).substring(0, 30); const getBranchName = () => { if (!process.env.BRANCH_NAME) { console.log('Usage: Need BRANCH_NAME env var'); process.exit(1); } return process.env.BRANCH_NAME; -} +}; async function main() { if (process.argv[2] === 'deploy') {