Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into pr/buttonsbond/5165
Browse files Browse the repository at this point in the history
  • Loading branch information
kishanprmr committed Jul 30, 2024
2 parents f4a7be7 + 0653d9c commit 9466569
Show file tree
Hide file tree
Showing 144 changed files with 3,493 additions and 804 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1181,6 +1181,15 @@
"contributions": [
"plugin"
]
},
{
"login": "alexandrudanpop",
"name": "Alexandru-Dan Pop",
"avatar_url": "https://avatars.githubusercontent.com/u/15979292?v=4",
"profile": "https://alexandrudanpop.dev/",
"contributions": [
"code"
]
}
],
"commitType": "docs"
Expand Down
44 changes: 23 additions & 21 deletions .github/workflows/build-cloud-nx.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,32 @@
name: build-cloud-nx

name: CI
on:
push:
branches:
- main
pull_request:

permissions:
actions: read
contents: read

jobs:
main:
name: Nx Cloud - Main Job
secrets:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
uses: nrwl/ci/.github/workflows/[email protected]
with:
number-of-agents: 3
init-commands: |
npx nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
parallel-commands-on-agents: |
npx nx affected --target=lint --parallel=3
npx nx affected --target=build -c production --parallel=3
npx nx run-many --target=test --projects=engine,shared,server-api --parallel=3
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: 20
cache: 'npm'

- run: npx nx-cloud start-ci-run --distribute-on="3 linux-large-js" --agents

- run: npm ci

- uses: nrwl/nx-set-shas@v4

agents:
name: Nx Cloud - Agents
secrets:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
uses: nrwl/ci/.github/workflows/[email protected]
with:
number-of-agents: 3
- run: npx nx affected --target=lint --agents
- run: npx nx affected --target=build -c production --agents
- run: npx nx run-many --target=test --projects=engine,shared,server-api --agents
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ Not into coding but still interested in contributing? Come join our [Discord](ht
<td align="center" valign="top" width="14.28%"><a href="https://github.com/drona2938"><img src="https://avatars.githubusercontent.com/u/34496554?v=4?s=100" width="100px;" alt="Aditya Rathore"/><br /><sub><b>Aditya Rathore</b></sub></a><br /><a href="#plugin-drona2938" title="Plugin/utility libraries">🔌</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/coderbob2"><img src="https://avatars.githubusercontent.com/u/47177246?v=4?s=100" width="100px;" alt="coderbob2"/><br /><sub><b>coderbob2</b></sub></a><br /><a href="#plugin-coderbob2" title="Plugin/utility libraries">🔌</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://raamyy.netlify.app"><img src="https://avatars.githubusercontent.com/u/29176293?v=4?s=100" width="100px;" alt="Ramy Gamal"/><br /><sub><b>Ramy Gamal</b></sub></a><br /><a href="#plugin-Raamyy" title="Plugin/utility libraries">🔌</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://alexandrudanpop.dev/"><img src="https://avatars.githubusercontent.com/u/15979292?v=4?s=100" width="100px;" alt="Alexandru-Dan Pop"/><br /><sub><b>Alexandru-Dan Pop</b></sub></a><br /><a href="https://github.com/activepieces/activepieces/commits?author=alexandrudanpop" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
18 changes: 18 additions & 0 deletions docs/flows/versioning.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
title: "Version History"
icon: 'clock'
description: "Learn how flow versioning works in Activepieces"
---

Activepieces keeps track of all published flows and their versions. Here’s how it works:

1. You can edit a flow as many times as you want in **draft** mode.
2. Once you're done with your changes, you can publish it.
3. The published flow will be **immutable** and cannot be edited.
4. If you try to edit a published flow, Activepieces will create a new **draft** if there is none and copy the **published** version to the new version.

This means you can always go back to a previous version and edit the flow in draft mode without affecting the published version.

![Flow History](/resources/flow-history.png)

As you can see in the following screenshot, the yellow dot refers to DRAFT and the green dot refers to PUBLISHED.
28 changes: 28 additions & 0 deletions docs/handbook/engineering/pre-releases.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
title: 'Pre-Releases'
---

Pre-releases are versions of the software that are released before the final version. They are used to test new features and bug fixes before they are released to the public. Pre-releases are typically labeled with a version number that includes a pre-release identifier, such as `official` or `rc`.

## Types of Releases

There are several types of releases that can be used to indicate the stability of the software:

- **Official**: Official releases are considered to be stable and are close to the final release.
- **Release Candidate (RC)**: Release candidates are versions of the software that are feature-complete and have been tested by a larger group of users. They are considered to be stable and are close to the final release. They are typically used for final testing before the final release.

## Why Use Pre-Releases

We do pre-release when we release hot-fixes / bug fixes / small and beta features.

## How to Release a Pre-Release

To release a pre-release version of the software, follow these steps:

1. **Create a new branch**: Create a new branch from the `main` branch. The branch name should be `release/vX.Y.Z` where `X.Y.Z` is the version number.
2. **Increase the version number**: Update the `package.json` file with the new version number.
3. **Open a Pull Request**: Open a pull request from the new branch to the `main` branch. Assign the `pre-release` label to the pull request.
4. **Check the Changelog**: Check the [Activepieces Releases](https://github.com/activepieces/activepieces/releases) page to see if there are any new features or bug fixes that need to be included in the pre-release. Make sure all PRs are labeled correctly so they show in the correct auto-generated changelog. If not, assign the labels and rerun the changelog by removing the "pre-release" label and adding it again to the PR.
5. Go to https://github.com/activepieces/activepieces/actions/workflows/release-rc.yml and run it on the release branch to build the rc image.
6. **Merge the Pull Request**: Merge the pull request to the `main` branch.
7. **Release the Notes**: Release the notes for the new version.
Loading

0 comments on commit 9466569

Please sign in to comment.