Skip to content

Commit

Permalink
Merge pull request #891 from turbot/v0.7.x
Browse files Browse the repository at this point in the history
Initial merge sync from release branches to main. Up to v0.7.2 RCs
  • Loading branch information
vhadianto authored Aug 22, 2024
2 parents 0288f1b + 69a52ac commit d09cbdf
Show file tree
Hide file tree
Showing 83 changed files with 7,620 additions and 3,717 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/devcontainers/go:1-1.21-bullseye
FROM mcr.microsoft.com/devcontainers/go:1-1.22-bullseye

ARG DEVCONTAINER_VERSION

Expand Down Expand Up @@ -43,7 +43,7 @@ USER vscode
# 5. Downloads the OpenAPI Generator CLI jar file, enabling the generation of API clients and documentation from a command line interface.
# 6. Activates the Yarn package manager via Corepack, preparing the environment for JavaScript package management and development.
RUN go install github.com/swaggo/swag/cmd/[email protected] \
&& go install github.com/goreleaser/goreleaser@v1.23.0 \
&& go install github.com/goreleaser/goreleaser/[email protected].0 \
&& go install github.com/mailhog/[email protected] \
&& mkdir -p /home/vscode/openapi-generator \
&& wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.6.0/openapi-generator-cli-6.6.0.jar -O /home/vscode/openapi-generator/openapi-generator-cli.jar \
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flowpipe-devcontainer",
"image": "ghcr.io/turbot/flowpipe-devcontainer:2.5.0",
"image": "ghcr.io/turbot/flowpipe-devcontainer:2.6.0",

"mounts": [
"source=${localWorkspaceFolder}/../pipe-fittings,target=/workspaces/pipe-fittings,type=bind,consistency=cached",
Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ labels: release
- [ ] Flowpipe Changelog updated and reviewed
- [ ] Update Flowipe dependency to `flowpipe-go-sdk` to use the relase tag
- [ ] Update Flowpipe dependency to `pipe-fittings` to use the relase tag
- [ ] Run release build. Do not tag `flowpipe repo``, the workflow will create the tag
- [ ] Run release build. Do not tag `flowpipe repo`, the workflow will create the tag
- [ ] Update Changelog in the Release page (copy and paste from CHANGELOG.md)
- [ ] Test Linux install script
- [ ] Test Windows install
Expand All @@ -39,11 +39,11 @@ labels: release

### flowpipe.io

- [ ] Raise Changelog update to `flowpipe.io` get it reviewed.
- [ ] Merge Changelog update to `flowpipe.io`. Need to get people who has permission in Vercel to do the last update: Ved, Chandra, John then anyone who has permission to the repo can merge it.
- [ ] Raise Changelog update to `flowpipe.io`, get it reviewed.
- [ ] Merge Changelog update to `flowpipe.io`.
- [ ] Run the Prod Deploy GitHub Action in `flowpipe.io` to publish the Changelog.

### Post release check & admin

- [ ] Test Homebrew install
- [ ] Release branches merged to `main` (all three repos `flowpipe`, `flowpipe-go-sdk`, `pipe-fittings`)
- [ ] Release branches merged to `develop` (all three repos `flowpipe`, `flowpipe-go-sdk`, `pipe-fittings`)
24 changes: 14 additions & 10 deletions .github/workflows/01-flowpipe-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ on:
version:
description: "Version (without 'v')"
required: true
default: 0.6.\invalid
confirmMain:
description: Confirm running on main branch
default: 0.7.\invalid
confirmDevelop:
description: Confirm running on develop branch
required: true
type: boolean

Expand Down Expand Up @@ -67,14 +67,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: validate
if: github.ref == 'refs/heads/main'
if: github.ref == 'refs/heads/develop'
env:
CONFIRM_MAIN: ${{ github.event.inputs.confirmMain }}
CONFIRM_MAIN: ${{ github.event.inputs.confirmDevelop }}
run: |
if [ "$CONFIRM_MAIN" == 'false' ]; then
echo "It looks like you've accidentally tried to run this action in main branch. Either: "
echo "It looks like you've accidentally tried to run this action in develop branch. Either: "
echo " - Re-run the action and select the branch you wanted, or"
echo " - If you really do want to run this for main, then re-run and tick the box to confirm"
echo " - If you really do want to run this for develop, then re-run and tick the box to confirm"
exit 1
fi
Expand All @@ -90,15 +90,15 @@ jobs:
ssh-key: ${{ secrets.PIPE_FITTINGS_DEPLOY_PRIVATE_KEY }}
repository: turbot/pipe-fittings
path: pipe-fittings
ref: v1.3.x
ref: develop

- name: Checkout Flowpipe SDK Go repository
uses: actions/checkout@v4
with:
ssh-key: ${{ secrets.FLOWPIPE_GO_SDK_DEPLOY_PRIVATE_KEY }}
repository: turbot/flowpipe-sdk-go
path: flowpipe-sdk-go
ref: v0.4.x
ref: develop

# - name: Unshallow
# run: git fetch --prune --unshallow
Expand All @@ -123,9 +123,13 @@ jobs:
# this is required, check golangci-lint-action docs
- uses: actions/setup-go@v4
with:
go-version: '1.21'
go-version: '1.22'
cache: false # setup-go v4 caches by default, do not change this parameter, check golangci-lint-action doc: https://github.com/golangci/golangci-lint-action/pull/704

- uses: actions/setup-node@v4
with:
node-version: 20

- name: Setup release environment
run: |-
cd flowpipe
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/10-test-lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
- v*
branches:
- main
- develop
- "v*"
workflow_dispatch:
pull_request:
Expand Down Expand Up @@ -65,22 +66,26 @@ jobs:
ssh-key: ${{ secrets.PIPE_FITTINGS_DEPLOY_PRIVATE_KEY }}
repository: turbot/pipe-fittings
path: pipe-fittings
ref: v1.3.x
ref: develop

- name: Checkout Flowpipe SDK Go repository
uses: actions/checkout@v4
with:
ssh-key: ${{ secrets.FLOWPIPE_GO_SDK_DEPLOY_PRIVATE_KEY }}
repository: turbot/flowpipe-sdk-go
path: flowpipe-sdk-go
ref: v0.4.x
ref: develop

# this is required, check golangci-lint-action docs
- uses: actions/setup-go@v4
with:
go-version: "1.21"
go-version: "1.22"
cache: false # setup-go v4 caches by default, do not change this parameter, check golangci-lint-action doc: https://github.com/golangci/golangci-lint-action/pull/704

- uses: actions/setup-node@v4
with:
node-version: 20

- name: Build UI
run: make build-ui
working-directory: flowpipe
Expand All @@ -89,7 +94,7 @@ jobs:
uses: golangci/golangci-lint-action@v3

with:
version: v1.55.2
version: v1.59.1
args: --timeout=15m
working-directory: flowpipe

Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/11-test-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- v*
branches:
- main
- develop
- "v*"
workflow_dispatch:
pull_request:
Expand Down Expand Up @@ -66,21 +67,25 @@ jobs:
ssh-key: ${{ secrets.PIPE_FITTINGS_DEPLOY_PRIVATE_KEY }}
repository: turbot/pipe-fittings
path: pipe-fittings
ref: v1.3.x
ref: develop

- name: Checkout Flowpipe SDK Go repository
uses: actions/checkout@v4
with:
ssh-key: ${{ secrets.FLOWPIPE_GO_SDK_DEPLOY_PRIVATE_KEY }}
repository: turbot/flowpipe-sdk-go
path: flowpipe-sdk-go
ref: v0.4.x
ref: develop

- uses: actions/setup-go@v4
with:
go-version: '1.21'
go-version: '1.22'
cache: false # setup-go v4 caches by default, do not change this parameter, check golangci-lint-action doc: https://github.com/golangci/golangci-lint-action/pull/704

- uses: actions/setup-node@v4
with:
node-version: 20

- name: Build UI
run: make build-ui
working-directory: flowpipe
Expand Down
6 changes: 4 additions & 2 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
version: 2

builds:
- id: flowpipe-linux-arm64
binary: flowpipe
Expand Down Expand Up @@ -79,7 +81,7 @@ snapshot:
name_template: "{{ incpatch .Version }}-next"

changelog:
skip: true
disable: true
sort: asc
filters:
exclude:
Expand All @@ -94,7 +96,7 @@ brews:
owner: turbot
name: homebrew-tap
branch: flowpipe-brew
folder: Formula
directory: Formula
url_template: "https://github.com/turbot/flowpipe/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
homepage: "https://flowpipe.io/"
description: "Flowpipe is a cloud scripting engine. Automation and workflow to connect your clouds to the people, systems and data that matters."
Expand Down
39 changes: 37 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,50 @@
# Flowpipe

## v0.6.0 [tbd]
## v0.7.2 [TBC]

_Bug fixes_

* Function step will no longer randomly fail in slower host machines. ([#888](https://github.com/turbot/flowpipe/issues/888)).
* Mod variable definition matches Powerpipe's definition. ([#889](https://github.com/turbot/flowpipe/issues/889)).

## v0.7.1 [2024-08-14]

_Bug fixes_

* Complex nested map data types in `pipeline param` no longer fails with a `mismatched types` error. ([#879](https://github.com/turbot/flowpipe/issues/879)).

## v0.7.0 [2024-08-14]

_What's new?_

* On-demand trigger execution. ([#864](https://github.com/turbot/flowpipe/issues/864)).
* `param` support for trigger. ([#840](https://github.com/turbot/flowpipe/issues/840)).

_Bug fixes_

* Complex data type in `pipeline param` no longer fails with a `mismatched types` error. ([#879](https://github.com/turbot/flowpipe/issues/879)).
* Pipeline `param` default value is not nested in a `map` data type. ([#880](https://github.com/turbot/flowpipe/issues/880)).

## v0.6.1 [2024-08-05]

_Bug fixes_

* The `variable` command no longer fails if the `.flowpipe` directory in the user's home directory is not created yet. ([#872](https://github.com/turbot/flowpipe/issues/872)).

## v0.6.0 [2024-07-24]

_What's new?_

* `--event-store` parameter to specify the location of the event store database. ([#852](https://github.com/turbot/flowpipe/issues/852)).
* Interactive workflows in the terminal via console integration. [Blog](https://flowpipe.io/blog/interactive-workflows-pipelines).
* Simplified progress output for `flowpipe pipeline run` command when running in [Client](https://flowpipe.io/docs/run#operating-modes) mode and not using the `--verbose` arg.
* `--data-dir` parameter to specify the location of the event store database. ([#852](https://github.com/turbot/flowpipe/issues/852)).
* `--execution-id` parameter to specify custom execution id for pipeline run. ([#856](https://github.com/turbot/flowpipe/issues/856)).
* Update `Go` version to v1.22.4.

_Bug fixes_

* Return a non-zero exit code if there's a failure. ([#855](https://github.com/turbot/flowpipe/issues/855)).
* `loop` block now respect the `if` step attribute. ([#858](https://github.com/turbot/flowpipe/issues/858)).

## v0.5.0 [2024-06-02]

Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
PACKAGE_NAME := github.com/turbot/flowpipe
GOLANG_CROSS_VERSION ?= v1.21.5
GOLANG_CROSS_VERSION ?= v1.22.4

.PHONY: build
build: build-ui
go build .

run-mod:
go run . server --mod-location ./internal/es/estest/default_mod
go run . server --mod-location ./internal/es/estest/trigger_mod

run-test-mod:
FP_VAR_var_from_env="from env var" go run . server --mod-location ./internal/es/estest/test_suite_mod
Expand Down Expand Up @@ -38,7 +38,7 @@ beta-tag-timetamp:

.PHONY: build-ui
build-ui:
cd ui/form && yarn install && yarn build
cd ui/form && corepack enable && yarn install && yarn build

.PHONY: test
test:
Expand Down
Loading

0 comments on commit d09cbdf

Please sign in to comment.