Skip to content
Open
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
17 changes: 4 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI
# Language/Tool dependency versions used in this workflow:
# Go: 1.20.2
# Helm: v4.0.0
# k6: v1.4.0
# k6: v1.4.2
# Kind: v0.30.0
# Kubeconform: v0.7.0
# Kubernetes: 1.34.2
Expand Down Expand Up @@ -83,13 +83,6 @@ jobs:
- name: Install npm packages
run: npm --prefix scripts/ install

- name: Download k6
uses: engineerd/configurator@v0.0.10
with:
name: "k6"
url: "https://github.com/grafana/k6/releases/download/v1.4.0/k6-v1.4.0-linux-amd64.tar.gz"
pathInArchive: "k6-v1.4.0-linux-amd64/k6"

- name: Build with Maven
run: mvn package jacoco:report

Expand Down Expand Up @@ -131,12 +124,10 @@ jobs:
name: thunder-artifacts
path: application/target

- name: Download k6
uses: engineerd/configurator@v0.0.10
- name: Setup k6
uses: grafana/setup-k6-action@v1
with:
name: "k6"
url: "https://github.com/grafana/k6/releases/download/v0.33.0/k6-v0.33.0-linux-amd64.tar.gz"
pathInArchive: "k6-v0.33.0-linux-amd64/k6"
k6-version: '1.4.2'

- name: Run test
run: ./scripts/ci/docker-integration-tests.sh ${{ matrix.testname }}
Expand Down
14 changes: 7 additions & 7 deletions scripts/eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import js from "@eslint/js";
import stylisticJs from '@stylistic/eslint-plugin-js'
import stylistic from '@stylistic/eslint-plugin'

export default [
js.configs.recommended,
{
plugins: {
'@stylistic/js': stylisticJs
'@stylistic': stylistic
},
languageOptions: {
globals: {
Expand All @@ -17,19 +17,19 @@ export default [
},
rules: {
// Never allow trailing commas on lists
"@stylistic/js/comma-dangle": ["error", "never"],
"@stylistic/comma-dangle": ["error", "never"],

// Align based on key values
"@stylistic/js/key-spacing": ["error", { "align": "value" }],
"@stylistic/key-spacing": ["error", { "align": "value" }],

// Max line length should be 120
"@stylistic/js/max-len": ["error", { "code": 120 }],
"@stylistic/max-len": ["error", { "code": 120 }],

// Allow multiple spaces when declaring requires
"@stylistic/js/no-multi-spaces": ["error", { "exceptions": { "VariableDeclarator": true } }],
"@stylistic/no-multi-spaces": ["error", { "exceptions": { "VariableDeclarator": true } }],

// Always force spacing between curly braces
"@stylistic/js/object-curly-spacing": ["error", "always"],
"@stylistic/object-curly-spacing": ["error", "always"],
}
}
];
107 changes: 80 additions & 27 deletions scripts/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"local-dynamo": "^0.6.0"
},
"devDependencies": {
"@stylistic/eslint-plugin-js": "^4.4.1",
"@stylistic/eslint-plugin": "^5.6.1",
"eslint": "^9.39.1"
},
"scripts": {
Expand Down
Loading