Skip to content

Commit

Permalink
Update GHA versions
Browse files Browse the repository at this point in the history
  • Loading branch information
jecklgamis committed Jun 21, 2023
1 parent b11034b commit 4f1ce72
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ci
name: Build
on:
push:
branches: [ main ]
Expand All @@ -12,24 +12,24 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: 1.17
go-version: 1.20
- name: Build
run: make dist-quick
- name: Log in to Docker Hub
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v4
with:
images: jecklgamis/gatling-server
- name: Build and push Docker image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
Expand Down
2 changes: 1 addition & 1 deletion pkg/handler/http_upload_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func someTaskManager() *taskmanager.TaskManager {
}

func someWorkspace() *workspace.Workspace {
dir, _ := ioutil.TempDir("", "workspace")
dir, _ := ioutil.TempDir("", "repos")
return workspace.NewWorkspace(dir)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/integrationtest/configs/config-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ server:
certFile: configs/server.crt

gatlingDir: gatling-charts-highcharts-bundle-3.7.3
workspaceDir: workspace
workspaceDir: repos
uploadDir: uploads

heartbeat:
Expand Down
2 changes: 1 addition & 1 deletion pkg/integrationtest/file_upload_task_int_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func startServer() (baseUrl string) {
os.Setenv("APP_ENVIRONMENT", "dev")
port := test.UnusedPort()
uploadDir, _ := ioutil.TempDir("", "uploads")
workspaceDir, _ := ioutil.TempDir("", "workspace")
workspaceDir, _ := ioutil.TempDir("", "repos")
go func() {
viper.Set("SERVER.HTTP.PORT", fmt.Sprintf("%d", port))
viper.Set("SERVER.HTTPS.PORT", fmt.Sprintf("%d", test.UnusedPort()))
Expand Down
2 changes: 1 addition & 1 deletion pkg/taskmanager/task_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func TestAbortTask(t *testing.T) {

func createSomeGatlingTask() *gatling.Task {
tmpDir, _ := ioutil.TempDir("", "")
userFilesDir, _ := workspace.NewUserFilesDir(filepath.Join(tmpDir, "workspace"))
userFilesDir, _ := workspace.NewUserFilesDir(filepath.Join(tmpDir, "repos"))
fileioutil.CopyFile("testdata/SingleFileExampleSimulation.scala",
fmt.Sprintf("%s/SingleFileExampleSimulation.scala",
userFilesDir.Simulations))
Expand Down

0 comments on commit 4f1ce72

Please sign in to comment.