Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/0.7.4 #92

Merged
merged 3 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,32 @@ jobs:
id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}

- name: Create Release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ github.token }}
- name: Publish docker image locally for Snyk action
run: make docker-build

- name: Run Snyk to monitor vulnerabilities in Docker image
uses: snyk/actions/docker@master
if: ${{ !contains(github.ref, 'rc') }}
with:
tag_name: ${{ steps.get_version.outputs.VERSION }}
release_name: Version ${{ steps.get_version.outputs.VERSION }}
draft: false
prerelease: false
image: "snowplow/dataflow-runner:${{ github.ref_name }}"
args: "--app-vulns --org=data-processing-new"
command: monitor
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

- name: Upload release binaries
uses: alexellis/[email protected]
- name: Create GitHub release and attach artifacts
uses: softprops/action-gh-release@v1
env:
GITHUB_TOKEN: ${{ github.token }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
asset_paths: '["./build/bin/*.zip"]'
draft: true
prerelease: ${{ contains(github.ref , '-') }}
name: Version ${{ github.ref_name }}
tag_name: ${{ github.ref_name }}
files: |
build/bin/dataflow_runner_${{ github.ref_name }}_darwin_amd64.zip
build/bin/dataflow_runner_${{ github.ref_name }}_linux_amd64.zip
build/bin/dataflow_runner_${{ github.ref_name }}_windows_amd64.zip

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,23 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2

- name: Extract project version from file
id: version
run: |
echo ::set-output name=VERSION::"$(cat VERSION)"

- name: Run tests
run: |
export PATH="$PATH:/tmp/consul/"
make test

- name: Publish docker image locally for Snyk action
run: make docker-build

- name: Snyk Setup
uses: snyk/actions/setup@master

- name: Run Snyk to check for vulnerabilities in Docker image
run: snyk container test snowplow/dataflow-runner:${{steps.version.outputs.VERSION}} --severity-threshold=high
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
20 changes: 0 additions & 20 deletions .github/workflows/snyk.yml

This file was deleted.

5 changes: 5 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Version 0.7.4 (2023-12-01)
--------------------------
Bump alpine version to 3.18.5 (#91)
Scan Docker images in Snyk Github action (#90)

Version 0.7.3 (2022-10-27)
--------------------------
Bump golang to 1.19.2 (#89)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.16.2
FROM alpine:3.18.5

LABEL maintainer="Snowplow Analytics <[email protected]>"

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

[release-image]: https://img.shields.io/badge/release-0.7.3-6ad7e5.svg?style=flat
[release-image]: https://img.shields.io/badge/release-0.7.4-6ad7e5.svg?style=flat
[releases]: https://github.com/snowplow/dataflow-runner/releases

[license-image]: https://img.shields.io/badge/license-Apache--2-blue.svg?style=flat
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.3
0.7.4
2 changes: 1 addition & 1 deletion src/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const (
appName = "dataflow-runner"
appUsage = "Run templatable playbooks of Hadoop/Spark/et al jobs on Amazon EMR"
appCopyright = "(c) 2016-2022 Snowplow Analytics Ltd"
cliVersion = "0.7.3"
cliVersion = "0.7.4"
varDelim = ","
fEmrConfig = "emr-config"
fEmrPlaybook = "emr-playbook"
Expand Down
Loading