Skip to content

Commit ac22659

Browse files
committed
Resolve CI error by adding necessary environment variables
Issue #6396
1 parent 0272a47 commit ac22659

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

.github/workflows/build.yml

+6
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,19 @@ jobs:
6666
# step 5.1
6767
- name: "Test, Check style, Check PMD, Check license with Maven and Java8"
6868
if: matrix.java == '8'
69+
env:
70+
SEATA_CONSOLE_USERNAME: seata
71+
SEATA_CONSOLE_PASSWORD: seata
6972
run: |
7073
./mvnw -T 4C clean test \
7174
-Dcheckstyle.skip=false -Dpmd.skip=false -Dlicense.skip=false -DredisCaseEnabled=true \
7275
-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
7376
# step 5.2
7477
- name: "Test with Maven and Java${{ matrix.java }}"
7578
if: matrix.java != '8'
79+
env:
80+
SEATA_CONSOLE_USERNAME: seata
81+
SEATA_CONSOLE_PASSWORD: seata
7682
run: |
7783
./mvnw -T 4C clean test \
7884
-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;

console/src/main/java/org/apache/seata/console/security/CustomUserDetailsServiceImpl.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,15 @@ public class CustomUserDetailsServiceImpl implements UserDetailsService {
4545
*/
4646
@PostConstruct
4747
public void init() throws IOException {
48-
console = System.console();
48+
String envUsername = System.getenv("SEATA_CONSOLE_USERNAME");
49+
String envPassword = System.getenv("SEATA_CONSOLE_PASSWORD");
50+
51+
if (envUsername != null && envPassword != null) {
52+
user = new User(envUsername, envPassword);
53+
return;
54+
}
4955

56+
console = System.console();
5057
if (console == null) {
5158
// In an IDE, 'System.console()' returns 'null', so 'BufferedReader' is used instead.
5259
BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));

0 commit comments

Comments
 (0)