diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca1a89a08..9000bd8cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,13 +14,14 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + with: + fetch-depth: 0 - # Remove this later - name: Clone internal repositories run: | git clone -b release https://${{ secrets.ACCESS_TOKEN }}@github.com/charmbracelet/charm-internal ../charm git clone -b master https://${{ secrets.ACCESS_TOKEN }}@github.com/charmbracelet/bubbletea-internal ../bubbletea - git clone -b master https://${{ secrets.ACCESS_TOKEN }}@github.com/charmbracelet/wish ../wish + git clone -b main https://${{ secrets.ACCESS_TOKEN }}@github.com/charmbracelet/wish ../wish - name: Set up Go uses: actions/setup-go@v2 diff --git a/.github/workflows/soft-serve.yml b/.github/workflows/soft-serve.yml index 311bb63f4..a6054e29a 100644 --- a/.github/workflows/soft-serve.yml +++ b/.github/workflows/soft-serve.yml @@ -14,9 +14,27 @@ jobs: with: fetch-depth: 0 + - name: Clone internal repositories + run: | + git clone -b release https://${{ secrets.ACCESS_TOKEN }}@github.com/charmbracelet/charm-internal ../charm + git clone -b master https://${{ secrets.ACCESS_TOKEN }}@github.com/charmbracelet/bubbletea-internal ../bubbletea + git clone -b main https://${{ secrets.ACCESS_TOKEN }}@github.com/charmbracelet/wish ../wish + - name: Push to Soft-Serve uses: charmbracelet/soft-serve-action@v1 with: - server: "beta.charm.sh" + server: "git.charm.sh" ssh-key: "${{ secrets.CHARM_SOFT_SERVE_KEY }}" - name: "soft-serve" \ No newline at end of file + name: "soft-serve" + + - name: Push vendor to Soft-Serve + env: + SSH_AUTH_SOCK: /tmp/ssh_agent.sock + run: | + git config --global user.email "actions@github.com" + git config --global user.name "Charmbracelet[bot]" + git checkout -b vendor + go mod vendor + git add vendor + git commit -m 'vendor' + git push -f soft-serve vendor