Fascinated/PIA-Servers
1
1
Fork 0
Code Issues 1 Pull Requests Actions Activity

Compare commits

base: Fascinated:6bff73fd722781f3a22f87f31d25ba39e33f70bf
Branches Tags
Fascinated:master
...
compare: Fascinated:317a6be54581aa0a1496e7314035bd0692c29e6b
Branches Tags
Fascinated:master

2 Commits
6bff73fd72 ... 317a6be545

Author SHA1 Message Date
Liam
317a6be545 Merge remote-tracking branch 'origin/master'
All checks were successful
Deploy to Dokku / docker (ubuntu-latest) (push) Successful in 39s
Details 
# Conflicts:
#	README.md
 2024-04-29 08:52:50 +01:00
Liam
ee094be2eb update user that pushes the commits 2024-04-29 08:52:37 +01:00
1 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

6
src/main/java/cc/fascinated/piaservers/common/GitUtils.java
View File

@ -13,13 +13,13 @@ public class GitUtils {
public static void commitFiles(String message, Path... files) { public static void commitFiles(String message, Path... files) {
System.out.println("Committing files"); System.out.println("Committing files");
if (Config.isProduction()) { if (Config.isProduction()) {
runCommand("git", "config", "--global", "user.email", "liam+pia-servers-ci@fascinated.cc"); runCommand("git", "config", "--global", "user.email", "fascinated-helper@fascinated.cc");
runCommand("git", "config", "--global", "user.name", "PIA Servers CI"); runCommand("git", "config", "--global", "user.name", "Fascinated's Helper");
for (Path file : files) { for (Path file : files) {
runCommand("git", "add", file.toAbsolutePath().toString()); runCommand("git", "add", file.toAbsolutePath().toString());
} }
runCommand("git", "commit", "-m", message); runCommand("git", "commit", "-m", message);
runCommand("git", "push", "https://pia-servers-ci:%s@git.fascinated.cc/Fascinated/PIA-Servers".formatted(System.getenv("AUTH_TOKEN"))); runCommand("git", "push", "https://fascinated-helper:%s@git.fascinated.cc/Fascinated/PIA-Servers".formatted(System.getenv("AUTH_TOKEN")));
} }
} }