Skip to content

Commit

Permalink
Merge branch 'master' of github.com:splitio/split-synchronizer
Browse files Browse the repository at this point in the history
  • Loading branch information
mmelograno committed Jun 6, 2023
2 parents 54ef4dd + 895cf01 commit 5a9c28d
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 109 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @splitio/sdk
18 changes: 6 additions & 12 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ jobs:
with:
fetch-depth: 0

- uses: actions/setup-go@v3
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: '^1.13.1'

Expand All @@ -40,7 +41,7 @@ jobs:
run: make release_assets

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v2
with:
role-to-assume: arn:aws:iam::825951051969:role/gha-downloads-role
aws-region: us-east-1
Expand All @@ -52,21 +53,14 @@ jobs:
SOURCE_DIR: ./build

- name: SonarQube Scan (Push)
uses: SonarSource/sonarcloud-github-action@v1.5
uses: SonarSource/sonarcloud-github-action@v1.9
env:
SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
with:
projectBaseDir: .
args: >
-Dsonar.host.url=${{ secrets.SONARQUBE_HOST }}
-Dsonar.projectName=${{ github.event.repository.name }}
-Dsonar.projectKey=${{ github.event.repository.name }}
-Dsonar.projectVersion=${{ env.VERSION }}
-Dsonar.exclusions=**/*_test.go,**/vendor/**,**/testdata/*,test/*
-Dsonar.test.inclusions=**/*_test.go,**/vendor/**,**/testdata/*,test/*
-Dsonar.go.coverage.reportPaths=coverage.out
-Dsonar.links.ci="https://github.com/splitio/${{ github.event.repository.name }}/actions"
-Dsonar.links.scm="https://github.com/splitio/${{ github.event.repository.name }}"
push-docker-image:
name: Build and Push Docker Image
Expand All @@ -76,7 +70,7 @@ jobs:
mode: [synchronizer, proxy]
steps:
- name: Login to Artifactory
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: splitio-docker.jfrog.io
username: ${{ secrets.ARTIFACTORY_DOCKER_USER }}
Expand All @@ -89,7 +83,7 @@ jobs:
run: echo "VERSION=$(awk '/^const Version/{gsub(/"/, "", $4); print $4}' splitio/version.go)" >> $GITHUB_ENV

- name: Docker Build and Push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: .
file: docker/Dockerfile.${{ matrix.mode }}
Expand Down
18 changes: 6 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ jobs:
with:
fetch-depth: 0

- uses: actions/setup-go@v3
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: '^1.13.1'

Expand All @@ -29,28 +30,21 @@ jobs:
- name: Run test
run: make test_coverage

- name: Create build folder
- name: Create build folder
run: mkdir -p build

- name: Build assets
run: make release_assets

- name: SonarQube Scan (Pull Request)
uses: SonarSource/sonarcloud-github-action@v1.5
uses: SonarSource/sonarcloud-github-action@v1.9
env:
SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
with:
projectBaseDir: .
args: >
-Dsonar.host.url=${{ secrets.SONARQUBE_HOST }}
-Dsonar.projectName=${{ github.event.repository.name }}
-Dsonar.projectKey=${{ github.event.repository.name }}
-Dsonar.projectVersion=${{ env.VERSION }}
-Dsonar.exclusions=**/*_test.go,**/vendor/**,**/testdata/*,test/*
-Dsonar.test.inclusions=**/*_test.go,**/vendor/**,**/testdata/*,test/*
-Dsonar.go.coverage.reportPaths=coverage.out
-Dsonar.links.ci="https://github.com/splitio/${{ github.event.repository.name }}/actions"
-Dsonar.links.scm="https://github.com/splitio/${{ github.event.repository.name }}"
-Dsonar.pullrequest.key=${{ github.event.pull_request.number }}
-Dsonar.pullrequest.branch=${{ github.event.pull_request.head.ref }}
-Dsonar.pullrequest.base=${{ github.event.pull_request.base.ref }}
Expand All @@ -66,15 +60,15 @@ jobs:
uses: actions/checkout@v3

- name: Docker Build and Push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: .
file: docker/Dockerfile.${{ matrix.mode }}
push: false
tags: splitio-docker.jfrog.io/split-${{ matrix.mode }}:latest

- name: Scan container using Lacework
uses: lacework/lw-scanner-action@v1.0.0
uses: lacework/lw-scanner-action@v1.3.2
with:
LW_ACCOUNT_NAME: ${{ secrets.LW_ACCOUNT_NAME }}
LW_ACCESS_TOKEN: ${{ secrets.LW_ACCESS_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unstable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
mode: [synchronizer, proxy]
steps:
- name: Login to Artifactory
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: splitio-docker-dev.jfrog.io
username: ${{ secrets.ARTIFACTORY_DOCKER_USER }}
Expand All @@ -26,7 +26,7 @@ jobs:
run: echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV

- name: Docker Build and Push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: .
file: docker/Dockerfile.${{ matrix.mode }}
Expand Down
1 change: 1 addition & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
5.3.1 (May 15, 2023)
- Fixed issue that caused newer redis versions & dragonfly authentication to fail in some scenarios
- Updated terminology on the Sync codebase to be more aligned with current standard without causing a breaking change. The core change is the term `split` for `feature flag` on things like logs and godoc comments.
- Updated dashboard logo and styles.

Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/gin-gonic/gin v1.9.0
github.com/google/uuid v1.3.0
github.com/splitio/gincache v0.0.1-rc7
github.com/splitio/go-split-commons/v4 v4.3.3-0.20230510150540-3ef2fd11d752
github.com/splitio/go-toolkit/v5 v5.2.3-0.20230510145423-72888e5c297c
github.com/splitio/go-split-commons/v4 v4.3.3
github.com/splitio/go-toolkit/v5 v5.3.1
go.etcd.io/bbolt v1.3.6
)

Expand Down
Loading

0 comments on commit 5a9c28d

Please sign in to comment.