diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 7d96e843..99649ac3 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -1,17 +1,15 @@ name: Continuous Integration on: - push: - branches: - - main workflow_dispatch: concurrency: - group: branch-main + group: branch-release-live jobs: publish: runs-on: ubuntu-latest + if: github.ref == 'refs/heads/release/live' steps: - name: Generate Token id: generate_token @@ -39,12 +37,12 @@ jobs: git config user.name "GitHub Actions Bot" git config user.email "<>" mv npmrc-ci .npmrc - npx turbo run release --concurrency 1 --filter=...[baseline] -- --prerelease dev --skip.tag --skip.changelog - npx turbo run deploy --filter=...[baseline] -- --tag dev + npx turbo run release --concurrency 1 --filter=...[baseline] -- --skip.tag --skip.changelog + npx turbo run deploy --filter=...[baseline] -- env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - name: Push Changes run: | git fetch origin - git merge -m "Merge branch 'main' [skip ci]" origin/main - git push origin HEAD:main + git merge -m "Merge branch 'release/live' [skip ci]" origin/release/live + git push origin HEAD:release/live diff --git a/.github/workflows/main.continuous-integration.yml b/.github/workflows/main.continuous-integration.yml new file mode 100644 index 00000000..7d96e843 --- /dev/null +++ b/.github/workflows/main.continuous-integration.yml @@ -0,0 +1,50 @@ +name: Continuous Integration + +on: + push: + branches: + - main + workflow_dispatch: + +concurrency: + group: branch-main + +jobs: + publish: + runs-on: ubuntu-latest + steps: + - name: Generate Token + id: generate_token + uses: tibdex/github-app-token@v1 + with: + app_id: ${{ vars.TOKEN_APP_ID }} + private_key: ${{ secrets.TOKEN_APP_PRIVATE_KEY }} + - uses: actions/checkout@v3 + with: + fetch-depth: 5 + token: ${{ steps.generate_token.outputs.token }} + - uses: actions/setup-node@v3 + with: + node-version: 18 + - name: Setup + run: | + yarn install + git tag baseline HEAD^ + echo Using baseline: + git log -1 --oneline baseline + - name: Build + run: yarn build --filter=...[baseline] + - name: Publish + run: | + git config user.name "GitHub Actions Bot" + git config user.email "<>" + mv npmrc-ci .npmrc + npx turbo run release --concurrency 1 --filter=...[baseline] -- --prerelease dev --skip.tag --skip.changelog + npx turbo run deploy --filter=...[baseline] -- --tag dev + env: + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + - name: Push Changes + run: | + git fetch origin + git merge -m "Merge branch 'main' [skip ci]" origin/main + git push origin HEAD:main diff --git a/.github/workflows/testing.continuous-integration.yml b/.github/workflows/testing.continuous-integration.yml new file mode 100644 index 00000000..215c0f58 --- /dev/null +++ b/.github/workflows/testing.continuous-integration.yml @@ -0,0 +1,50 @@ +name: Continuous Integration + +on: + push: + branches: + - release/live + workflow_dispatch: + +concurrency: + group: branch-release-live + +jobs: + publish: + runs-on: ubuntu-latest + steps: + - name: Generate Token + id: generate_token + uses: tibdex/github-app-token@v1 + with: + app_id: ${{ vars.TOKEN_APP_ID }} + private_key: ${{ secrets.TOKEN_APP_PRIVATE_KEY }} + - uses: actions/checkout@v3 + with: + fetch-depth: 5 + token: ${{ steps.generate_token.outputs.token }} + - uses: actions/setup-node@v3 + with: + node-version: 18 + - name: Setup + run: | + yarn install + git tag baseline HEAD^ + echo Using baseline: + git log -1 --oneline baseline + - name: Build + run: yarn build --filter=...[baseline] + - name: Publish + run: | + git config user.name "GitHub Actions Bot" + git config user.email "<>" + mv npmrc-ci .npmrc + npx turbo run release --concurrency 1 --filter=...[baseline] -- --prerelease testing --skip.tag --skip.changelog + npx turbo run deploy --filter=...[baseline] -- --tag testing + env: + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + - name: Push Changes + run: | + git fetch origin + git merge -m "Merge branch 'release/live' [skip ci]" origin/release/live + git push origin HEAD:release/live diff --git a/packages/sdk/package.json b/packages/sdk/package.json index b941d394..d9d5d68d 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -27,7 +27,7 @@ "license": "MIT", "dependencies": { "@evoke-platform/context": "latest", - "@evoke-platform/payment": "^1.0.0-dev.0", + "@evoke-platform/payment": "latest", "@evoke-platform/ui-components": "latest" }, "devDependencies": {