diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 40bf6cafa3..824a7316a6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -64,7 +64,6 @@ jobs: release: name: Release runs-on: - group: Default Larger Runners labels: ${{ matrix.os }} needs: prepare timeout-minutes: 60 @@ -74,10 +73,12 @@ jobs: include: - os: ubuntu-20-16-cores file_name: dozer + target: x86_64-unknown-linux-gnu asset_name: dozer-linux-amd64 - # - os: macos-12 - # file_name: dozer - # asset_name: dozer-macos-amd64 + - os: macos-12 + file_name: dozer + target: x86_64-apple-darwin + asset_name: dozer-macos-amd64 steps: - uses: actions/checkout@v3 - name: Install minimal stable with clippy and rustfmt @@ -85,6 +86,7 @@ jobs: with: profile: minimal toolchain: stable + target: ${{ matrix.target }} components: rustfmt, clippy - name: Install Protoc uses: arduino/setup-protoc@v1 @@ -106,15 +108,15 @@ jobs: ${{ runner.os }}-cargo-release-${{ hashFiles('Cargo.lock') }} ${{ runner.os }}-cargo-release- - - name: Prepare build package - run: cargo build --features=snowflake --release + - name: Build package + run: cargo build --release --target ${{ matrix.target }} - name: Prepare release assets shell: bash run: | mkdir -p release cp {LICENSE,README.md,CHANGELOG.md} release/ 2> /dev/null || echo "Copy Failed...Ignoring.." - cp target/release/${{matrix.file_name}} release/ + cp target/${{ matrix.target }}/release/${{matrix.file_name}} release/ mv release/ ${{matrix.asset_name}}-${{ needs.prepare.outputs.version }}/ @@ -140,45 +142,7 @@ jobs: run: | echo "RELEASE_NAME=${{env.RELEASE_NAME}}" >> $GITHUB_ENV echo "VERSION=${{env.VERSION}}" >> $GITHUB_ENV - echo "ARTIFACT_URL=https://${{ env.BUCKET_NAME }}.s3.ap-southeast-1.amazonaws.com/${{ env.VERSION }}/${{ env.RELEASE_NAME }}" >> $GITHUB_ENV - - name: configure aws credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }} - role-session-name: deployer - aws-region: ap-southeast-1 - - - name: Upload release to S3 - id: upload_s3 - run: | - aws s3 cp $RELEASE_NAME s3://${{ env.BUCKET_NAME }}/$VERSION/$RELEASE_NAME - - - name: Build, tag, and push image to Amazon ECR - id: build_push_ecr - if: matrix.os == 'ubuntu-20-16-cores' - env: - IMAGE_TAG: ${{ needs.prepare.outputs.version }} - run: | - SHORT_GITHUB_SHA=$(echo ${GITHUB_SHA} | cut -c1-8) - echo "SHORT_GITHUB_SHA=$SHORT_GITHUB_SHA" >> $GITHUB_OUTPUT - aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin $ECR_REGISTRY - docker build -f ci/Dockerfile -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$SHORT_GITHUB_SHA . - docker push $ECR_REGISTRY/$ECR_REPOSITORY --all-tags - - - name: Update latest image if releasing - if: (needs.prepare.outputs.prerelease == 'false') && (matrix.os == 'ubuntu-20-16-cores') - env: - IMAGE_TAG: ${{ needs.prepare.outputs.version }} - run: | - docker tag $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG $ECR_REGISTRY/$ECR_REPOSITORY:latest - docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest - -# - name: Clean up Amazon ECR untagged images -# run: | -# IMAGES_TO_DELETE=$( aws ecr list-images --region us-east-1 --repository-name $ECR_REPOSITORY --filter "tagStatus=UNTAGGED" --query 'imageIds[*]' --output json ) -# aws ecr batch-delete-image --region us-east-1 --repository-name $ECR_REPOSITORY --image-ids "$IMAGES_TO_DELETE" || true - - name: Trigger BuildKite integration tests run: | curl -X POST "https://api.buildkite.com/v2/organizations/dozer-data-pte-ltd/pipelines/integration-tests/builds" \ @@ -195,7 +159,6 @@ jobs: "fields": [ { "name": "Repository", "value": "[getdozer/dozer](https://github.com/getdozer/dozer)", "inline": true }, { "name": "Binary", "value": "[${{ env.RELEASE_NAME }}](${{ env.ARTIFACT_URL }})", "inline": true }, - { "name": "Using Docker", "value": "`docker run ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY}}:${{ env.VERSION }} dozer -h`"}, { "name": "Using Binary", "value": "`dozer -h`"}, { "name": "Release Notes", "value": "Release notes can be found [here](https://github.com/getdozer/dozer/releases/tag/${{env.VERSION}})"} ], diff --git a/Cargo.lock b/Cargo.lock index 94460f90f6..e1c4bf7749 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2065,7 +2065,7 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" [[package]] name = "dozer-admin" -version = "0.1.10" +version = "0.1.11" dependencies = [ "clap 4.1.8", "diesel", @@ -2093,7 +2093,7 @@ dependencies = [ [[package]] name = "dozer-api" -version = "0.1.10" +version = "0.1.11" dependencies = [ "Inflector", "actix-cors", @@ -2128,7 +2128,7 @@ dependencies = [ [[package]] name = "dozer-cache" -version = "0.1.10" +version = "0.1.11" dependencies = [ "criterion", "dozer-storage", @@ -2145,7 +2145,7 @@ dependencies = [ [[package]] name = "dozer-core" -version = "0.1.10" +version = "0.1.11" dependencies = [ "crossbeam", "daggy", @@ -2160,7 +2160,7 @@ dependencies = [ [[package]] name = "dozer-ingestion" -version = "0.1.10" +version = "0.1.11" dependencies = [ "base64 0.21.0", "bson", @@ -2197,7 +2197,7 @@ dependencies = [ [[package]] name = "dozer-orchestrator" -version = "0.1.10" +version = "0.1.11" dependencies = [ "clap 4.1.8", "crossterm", @@ -2227,7 +2227,7 @@ dependencies = [ [[package]] name = "dozer-sql" -version = "0.1.10" +version = "0.1.11" dependencies = [ "ahash 0.8.3", "bloom", @@ -2248,7 +2248,7 @@ dependencies = [ [[package]] name = "dozer-storage" -version = "0.1.10" +version = "0.1.11" dependencies = [ "dozer-types", "lmdb-rkv", @@ -2258,7 +2258,7 @@ dependencies = [ [[package]] name = "dozer-tests" -version = "0.1.10" +version = "0.1.11" dependencies = [ "bson", "clap 4.1.8", @@ -2282,7 +2282,7 @@ dependencies = [ [[package]] name = "dozer-tracing" -version = "0.1.10" +version = "0.1.11" dependencies = [ "dozer-types", "opentelemetry", @@ -2294,7 +2294,7 @@ dependencies = [ [[package]] name = "dozer-types" -version = "0.1.10" +version = "0.1.11" dependencies = [ "ahash 0.8.3", "arrow 33.0.0", diff --git a/dozer-admin/Cargo.toml b/dozer-admin/Cargo.toml index 057f5c227a..0e82e0e2b1 100644 --- a/dozer-admin/Cargo.toml +++ b/dozer-admin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dozer-admin" -version = "0.1.10" +version = "0.1.11" authors = ["getdozer/dozer-dev"] edition = "2021" build = "build.rs" diff --git a/dozer-api/Cargo.toml b/dozer-api/Cargo.toml index 54f19933c5..f9070d4416 100644 --- a/dozer-api/Cargo.toml +++ b/dozer-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dozer-api" -version = "0.1.10" +version = "0.1.11" edition = "2021" authors = ["getdozer/dozer-dev"] diff --git a/dozer-cache/Cargo.toml b/dozer-cache/Cargo.toml index 89ed5783a3..e2e4de4888 100644 --- a/dozer-cache/Cargo.toml +++ b/dozer-cache/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dozer-cache" -version = "0.1.10" +version = "0.1.11" edition = "2021" authors = ["getdozer/dozer-dev"] diff --git a/dozer-core/Cargo.toml b/dozer-core/Cargo.toml index 37da55d50f..9a5233a2dc 100644 --- a/dozer-core/Cargo.toml +++ b/dozer-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dozer-core" -version = "0.1.10" +version = "0.1.11" edition = "2021" authors = ["getdozer/dozer-dev"] diff --git a/dozer-ingestion/Cargo.toml b/dozer-ingestion/Cargo.toml index 1f05b5963b..866c1c2cf7 100644 --- a/dozer-ingestion/Cargo.toml +++ b/dozer-ingestion/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dozer-ingestion" -version = "0.1.10" +version = "0.1.11" edition = "2021" authors = ["getdozer/dozer-dev"] diff --git a/dozer-orchestrator/Cargo.toml b/dozer-orchestrator/Cargo.toml index 202aa526f3..64b5bf849a 100644 --- a/dozer-orchestrator/Cargo.toml +++ b/dozer-orchestrator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dozer-orchestrator" -version = "0.1.10" +version = "0.1.11" edition = "2021" default-run = "dozer" authors = ["getdozer/dozer-dev"] diff --git a/dozer-sql/Cargo.toml b/dozer-sql/Cargo.toml index 78ded499a2..2d23a51192 100644 --- a/dozer-sql/Cargo.toml +++ b/dozer-sql/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dozer-sql" -version = "0.1.10" +version = "0.1.11" edition = "2021" authors = ["getdozer/dozer-dev"] diff --git a/dozer-storage/Cargo.toml b/dozer-storage/Cargo.toml index 30bbe07195..4eb596b9dd 100644 --- a/dozer-storage/Cargo.toml +++ b/dozer-storage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dozer-storage" -version = "0.1.10" +version = "0.1.11" edition = "2021" authors = ["getdozer/dozer-dev"] diff --git a/dozer-tests/Cargo.toml b/dozer-tests/Cargo.toml index efc29eaf44..c7f30c3d8a 100644 --- a/dozer-tests/Cargo.toml +++ b/dozer-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dozer-tests" -version = "0.1.10" +version = "0.1.11" edition = "2021" authors = ["getdozer/dozer-dev"] diff --git a/dozer-tracing/Cargo.toml b/dozer-tracing/Cargo.toml index ba9854c3f2..6eb4747842 100644 --- a/dozer-tracing/Cargo.toml +++ b/dozer-tracing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dozer-tracing" -version = "0.1.10" +version = "0.1.11" edition = "2021" authors = ["getdozer/dozer-dev"] diff --git a/dozer-types/Cargo.toml b/dozer-types/Cargo.toml index 05a8bc1354..11833f272e 100644 --- a/dozer-types/Cargo.toml +++ b/dozer-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dozer-types" -version = "0.1.10" +version = "0.1.11" authors = ["getdozer/dozer-dev"] edition = "2021"