diff --git a/.devcontainer.bak/devcontainer.json b/.devcontainer.bak/devcontainer.json new file mode 100644 index 0000000..ac3e23a --- /dev/null +++ b/.devcontainer.bak/devcontainer.json @@ -0,0 +1,12 @@ +{ + "name": "Java", + "image": "mcr.microsoft.com/devcontainers/java:1-21", + "features": { + "ghcr.io/devcontainers/features/java:1": { + "version": "none", + "installMaven": "true", + "mavenVersion": "3.8.6", + "installGradle": "true" + } + } +} \ No newline at end of file diff --git a/.github/workflows/junie.yml b/.github/workflows/junie.yml new file mode 100644 index 0000000..66a8e4e --- /dev/null +++ b/.github/workflows/junie.yml @@ -0,0 +1,22 @@ +name: Junie +run-name: Junie run ${{ inputs.run_id }} + +permissions: + contents: write + pull-requests: write + +on: + workflow_dispatch: + inputs: + run_id: + description: "id of workflow process" + required: true + workflow_params: + description: "stringified params" + required: true + +jobs: + call-workflow-passing-data: + uses: jetbrains-junie/junie-workflows/.github/workflows/ej-issue.yml@main + with: + workflow_params: ${{ inputs.workflow_params }} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..6c2ff60 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "githubPullRequests.ignoredPullRequestBranches": [ + "master" + ] +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3707141..1695d79 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,13 @@ 6.8.1 test + + tc-demo + shared + 1.0-SNAPSHOT + system + ${basedir}/lib/shared-1.0-SNAPSHOT.jar + diff --git a/src/main/java/tcdemo/Compare.java b/src/main/java/tcdemo/Compare.java index 1a12160..9fc7ca2 100644 --- a/src/main/java/tcdemo/Compare.java +++ b/src/main/java/tcdemo/Compare.java @@ -2,7 +2,10 @@ public class Compare { + // version: 2 + public static void main(String[] args) { new Executor().execute(args, new CompareAction(), Compare.class.getName()); + System.out.println(2); } } diff --git a/src/main/java/tcdemo/Executor.java b/src/main/java/tcdemo/Executor.java deleted file mode 100644 index 062c7bc..0000000 --- a/src/main/java/tcdemo/Executor.java +++ /dev/null @@ -1,16 +0,0 @@ -package tcdemo; - -import java.util.Comparator; - -public class Executor { - - public void execute(String[] args, Comparator action, String mainClassName) { - if (args.length < 2){ - System.err.printf("Usage tcdemo.%s %n", mainClassName); - System.exit(2); - } - - System.out.println(action.compare(args[0], args[1])); - } - -} diff --git a/src/test/java/tcdemo/CompareTest.java b/src/test/java/tcdemo/CompareTest.java index c4dcc58..74aafc2 100644 --- a/src/test/java/tcdemo/CompareTest.java +++ b/src/test/java/tcdemo/CompareTest.java @@ -1,5 +1,8 @@ package tcdemo; + +: + import junit.framework.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -12,6 +15,13 @@ public class CompareTest { @BeforeMethod public void setUp(){ myAction = new CompareAction(); + System.out.println("Hello"); } } +New +New +New +New +New +New diff --git a/src/test/teamcity-srv.yaml b/src/test/teamcity-srv.yaml new file mode 100644 index 0000000..fff1d14 --- /dev/null +++ b/src/test/teamcity-srv.yaml @@ -0,0 +1,19 @@ +version: "3" +services: + web: + # replace username/repo:tag with your name and image details + image: username/repository:tag + deploy: + replicas: 5 + resources: + limits: + cpus: "0.1" + memory: 50M + restart_policy: + condition: on-failure + ports: + - "80:80" + networks: + - webnet +networks: + webnet: diff --git a/update.sh b/update.sh new file mode 100755 index 0000000..a653041 --- /dev/null +++ b/update.sh @@ -0,0 +1,7 @@ +#!/bin/sh +source version.txt +((version+=1)) +echo version=$version > version.txt +git add version.txt +git commit -m "version=$version" +git push \ No newline at end of file diff --git a/version.txt b/version.txt new file mode 100644 index 0000000..0aa4498 --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ +version=6