diff --git a/.github/workflows/files-changed.yml b/.github/workflows/files-changed.yml index 0d43e191a3..156b61d974 100644 --- a/.github/workflows/files-changed.yml +++ b/.github/workflows/files-changed.yml @@ -30,7 +30,8 @@ jobs: steps: - uses: actions/checkout@v3 - uses: dorny/paths-filter@v2 - id: changes + id: changes_check + if: env.ACT_EXEC != 'true' with: filters: | backend: @@ -63,3 +64,22 @@ jobs: - "Dockerfile.rootless" - "docker/**" - "Makefile" + - name: set outputs result + id: changes + run: | + if [ "$ACT_EXEC" == 'true' ]; then + # set default value for 'act_runner exec' + { echo "backend=true" ; \ + echo "frontend=true" ; \ + echo "docs=true" ; \ + echo "actions=true" ; \ + echo "templates=true" ; \ + echo "docker=true" ; } >> "$GITHUB_OUTPUT" + else + { echo "backend=${{ steps.changes_check.outputs.backend }}" ; \ + echo "frontend=${{ steps.changes_check.outputs.frontend }}" ; \ + echo "docs=${{ steps.changes_check.outputs.docs }}" ; \ + echo "actions=${{ steps.changes_check.outputs.actions }}" ; \ + echo "actions=${{ steps.changes_check.outputs.templates }}" ; \ + echo "actions=${{ steps.changes_check.outputs.docker }}" ; } >> "$GITHUB_OUTPUT" + fi diff --git a/.github/workflows/pull-db-tests.yml b/.github/workflows/pull-db-tests.yml index 12e5e64e80..c73ad3602e 100644 --- a/.github/workflows/pull-db-tests.yml +++ b/.github/workflows/pull-db-tests.yml @@ -128,7 +128,7 @@ jobs: go-version: ">=1.20" check-latest: true - name: Add hosts to /etc/hosts - run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 mysql elasticsearch smtpimap" | sudo tee -a /etc/hosts' + run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 mysql elasticsearch smtpimap redis minio" | sudo tee -a /etc/hosts' - run: make deps-backend - run: make backend env: diff --git a/modules/queue/base_redis_test.go b/modules/queue/base_redis_test.go index 19fbccbc8f..0df0a65546 100644 --- a/modules/queue/base_redis_test.go +++ b/modules/queue/base_redis_test.go @@ -54,14 +54,14 @@ func TestBaseRedis(t *testing.T) { _ = redisServer.Wait() } }() - if !waitRedisReady("redis://127.0.0.1:6379/0", 0) { + if !waitRedisReady("redis://redis:6379/0", 0) { redisServer = redisServerCmd(t) if redisServer == nil && os.Getenv("CI") == "" { t.Skip("redis-server not found") return } assert.NoError(t, redisServer.Start()) - if !assert.True(t, waitRedisReady("redis://127.0.0.1:6379/0", 5*time.Second), "start redis-server") { + if !assert.True(t, waitRedisReady("redis://redis:6379/0", 5*time.Second), "start redis-server") { return } } diff --git a/modules/storage/minio_test.go b/modules/storage/minio_test.go index af392b7e22..8fdf31e6cf 100644 --- a/modules/storage/minio_test.go +++ b/modules/storage/minio_test.go @@ -17,7 +17,7 @@ func TestMinioStorageIterator(t *testing.T) { } testStorageIterator(t, setting.MinioStorageType, &setting.Storage{ MinioConfig: setting.MinioStorageConfig{ - Endpoint: "127.0.0.1:9000", + Endpoint: "minio:9000", AccessKeyID: "123456", SecretAccessKey: "12345678", Bucket: "gitea",