Skip to content

Commit

Permalink
Merge branch 'task/arm' of github.com:splitio/split-evaluator into ta…
Browse files Browse the repository at this point in the history
…sk/arm
  • Loading branch information
mmelograno committed Dec 17, 2024
2 parents 0eb6153 + 1b3b0d2 commit 1eec26a
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
run: echo "BUILD_VERSION=$(cat package.json | grep version | head -1 | awk '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]')" >> $GITHUB_ENV

- name: Docker build
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
push: ${{ github.event_name == 'push' }}
Expand All @@ -59,7 +59,7 @@ jobs:
run: echo "BUILD_VERSION=$(cat package.json | grep version | head -1 | awk '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]')" >> $GITHUB_ENV

- name: Docker build
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
push: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unstable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV

- name: Docker Build
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
push: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-license-year.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
git commit -m "Updated License Year" -a
- name: Create Pull Request
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
token: ${{ secrets.GITHUB_TOKEN }}
title: Update License Year
Expand Down
2 changes: 1 addition & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
2.6.1 (Dec 17, 2024)
- Updated base image to node:20.13.1-alpine3.20
- Updated @splitsoftware/splitio package to version 11.0.3 that includes vulnerability fixes and improvements.
- Updated @splitsoftware/splitio package to version 11.0.3 that includes vulnerability fixes and other improvements.

2.6.0 (May 16, 2024)
- Updated @splitsoftware/splitio package to version 10.26.0 that includes:
Expand Down
2 changes: 1 addition & 1 deletion client/__tests__/track.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ describe('track', () => {
];
const key = getLongKey();
const response = await request(app)
.get(`/client/track?key=${key}&event-type=my-event&traffic-type=my-traffic&value=1`)
.get(`/client/track?key=${key}&event-type=my-event&traffic-type=my-traffic&value=1`)
.set('Authorization', 'test');
expectErrorContaining(response, 400, expected);
});
Expand Down
2 changes: 0 additions & 2 deletions listener/__tests__/ip-addresses.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ describe('ip addresses', () => {
await new Promise(resolve => setTimeout(resolve, 100));
expect(ip).toBe(false);
expect(hostname).toBe(false);
await Promise.resolve();
});
});

Expand All @@ -80,7 +79,6 @@ describe('ip addresses', () => {
await new Promise(resolve => setTimeout(resolve, 100));
expect(ip).toBe(localIp.address());
expect(hostname).toBe(os.hostname());
await Promise.resolve();
});
});
});

0 comments on commit 1eec26a

Please sign in to comment.