diff --git a/.github/workflows/deploy-site.yaml b/.github/workflows/deploy-site.yaml index 779e594f2..71eed5dd7 100644 --- a/.github/workflows/deploy-site.yaml +++ b/.github/workflows/deploy-site.yaml @@ -19,40 +19,29 @@ jobs: id-token: write packages: write steps: - - uses: actions/checkout@v3 + - name: Checkout formBuilder + uses: actions/checkout@v3 with: - fetch-depth: 0 + repository: kevinchappell/formBuilder + fetch-depth: 1 + ref: master + + - name: Checkout formBuilder-site + uses: actions/checkout@v3 + with: + repository: kevinchappell/formBuilder-site + fetch-depth: 1 + ref: master + - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 cache: 'npm' - - name: Install dependencies - env: - CI: true - run: npm install - - name: Build the plugin - run: npm run build - - name: Get npm package version using jq - if: success() - id: get_version + - name: Update website dependencies run: | - VERSION=$(jq -r ".version" package.json) - echo "::set-output name=version::$VERSION" - - - name: Deploy the website - env: - VERSION: ${{ steps.get_version.outputs.version }} - TOKEN: ${{ secrets.FORMBUILDER_SITE_PAT }} - run: | - git config --global user.name "GitHub Actions" - git config --global user.email "actions@github.com" - - git clone https://${TOKEN}@github.com/kevinchappell/formBuilder-site.git - cd formBuilder-site - npm version ${{ env.VERSION }} - - # Commit and push the changes - git commit -am "Update site to ${{ env.VERSION }}" - git push https://${TOKEN}@github.com/kevinchappell/formBuilder-site.git master + cd kevinchappell/formBuilder-site + npm update formBuilder formBuilder-languages + npm version $(cd ../formBuilder && node -p "require('./package.json').version") + git push --follow-tags