diff --git a/.github/actions/buildtest/action.yml b/.github/actions/buildtest/action.yml index b22a7932a..4de1070eb 100644 --- a/.github/actions/buildtest/action.yml +++ b/.github/actions/buildtest/action.yml @@ -8,9 +8,6 @@ inputs: bt-param: # id of input description: 'Build and test params' required: true - artifact-name: # id of input - description: 'Artifact name' - required: true module-name: # id of module description: 'module namespace' required: true diff --git a/.github/actions/preinstall/action.yml b/.github/actions/preinstall/action.yml index 10dd6c6ad..86db1cfde 100644 --- a/.github/actions/preinstall/action.yml +++ b/.github/actions/preinstall/action.yml @@ -8,9 +8,6 @@ inputs: bt-param: # id of input description: 'Build and test params' required: true - artifact-name: # id of input - description: 'Artifact name' - required: true version: description: 'version number' required: true @@ -34,5 +31,4 @@ runs: - id: random-number-generator run: echo "::set-output name=random-id::123" # run: echo "random-id=123" >> GITHUB_OUTPUT - shell: bash - + shell: bash \ No newline at end of file diff --git a/.github/actions/startdeps/action.yml b/.github/actions/startdeps/action.yml index f015a4b4c..70171efbf 100644 --- a/.github/actions/startdeps/action.yml +++ b/.github/actions/startdeps/action.yml @@ -9,16 +9,15 @@ runs: using: "composite" steps: - name: Setup DotNet - if: inputs.module-name == 'openmaqs-webservices' + if: inputs.module-name == 'openmaqs-webservices' || inputs.module-name == 'openmaqs-cucumber' uses: actions/setup-dotnet@v1 with: dotnet-version: | - 3.1.x 6.x.x - name: Start MAQS test services container - if: inputs.module-name == 'openmaqs-webservices' + if: inputs.module-name == 'openmaqs-webservices' || inputs.module-name == 'openmaqs-cucumber' shell: pwsh - #run: docker-compose -f docker/MAQSService/docker-compose.yml -p OpenMAQS/maqs-java up -d +# run: docker-compose -f docker/MAQSService/docker-compose.yml -p OpenMAQS/openmaqs-java up -d run: Start-Process -FilePath "dotnet" -ArgumentList "run --project docker/MAQSService/MainTestService/MainTestService.csproj" - name: Build the docker-compose stack if: inputs.module-name == 'openmaqs-database' diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d968fa189..fd7d9daf2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -64,13 +64,13 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v3.13.0 + uses: actions/setup-java@v4.2.1 with: distribution: zulu java-version: 17 cache: maven - name: Restore Local Maven Cache - uses: actions/cache@v3.3.1 + uses: actions/cache@v3.3.2 with: path: ~/.m2 key: ${{runner.os}}-m2 @@ -153,7 +153,7 @@ jobs: bt-param: '-fae -B -e -Dtesting=solo -T 1C' version: ${{ github.sha }} - name: Test Reporting - if: always() && github.actor != 'dependabot[bot]' + if: always() id: test-report uses: phoenix-actions/test-reporting@v12 with: @@ -193,7 +193,7 @@ jobs: with: path: ${{github.workspace}}/artifacts/ - name: Set up JDK 17 - uses: actions/setup-java@v3.13.0 + uses: actions/setup-java@v4.2.1 with: distribution: zulu java-version: 17 @@ -205,7 +205,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Restore Local Maven Cache - uses: actions/cache@v3.3.1 + uses: actions/cache@v3.3.2 with: path: ~/.m2 key: ${{ runner.os }}-maven-${{github.sha}}.${{github.run_number}} @@ -225,13 +225,13 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v3.13.0 + uses: actions/setup-java@v4.2.1 with: distribution: zulu java-version: 17 cache: maven - name: Restore Local Maven Cache - uses: actions/cache@v3.3.1 + uses: actions/cache@v3.3.2 with: path: ~/.m2 key: ${{runner.os}}-m2 @@ -240,7 +240,6 @@ jobs: labels: name: Pull Request Labels - if: github.actor != 'dependabot[bot]' runs-on: ubuntu-latest steps: - name: Label Pull Request @@ -257,13 +256,13 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3.13.0 + uses: actions/setup-java@v4.2.1 with: distribution: zulu java-version: 11 cache: maven - name: Restore Local Maven Cache - uses: actions/cache@v3.3.1 + uses: actions/cache@v3.3.2 with: path: ~/.m2 key: ${{runner.os}}-m2 @@ -287,7 +286,7 @@ jobs: with: github-token: ${{secrets.GITHUB_TOKEN}} script: | - const result = await github.rest.repos.listReleases({ + const result = await github.action.repos.listReleases({ owner: context.repo.owner, repo: context.repo.repo }) @@ -296,7 +295,7 @@ jobs: for(var key in data){ if(data[key].tag_name == "v${{ needs.getVersion.outputs.buildNumber }}" && data[key].draft == true) { - github.rest.repos.updateRelease({ + github.action.repos.updateRelease({ release_id: data[key].id, "draft": false, owner: context.repo.owner, diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 808bb7609..15d184f53 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,11 +38,11 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v3.13.0 + uses: actions/setup-java@v4.2.1 with: java-version: 17 - name: Maven Cache - uses: actions/cache@v3.3.1 + uses: actions/cache@v3.3.2 with: path: ~/.m2 key: ${{runner.os}}-m2 @@ -96,11 +96,11 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v3.13.0 + uses: actions/setup-java@v4.2.1 with: java-version: 17 - name: Maven Cache - uses: actions/cache@v3.3.1 + uses: actions/cache@v3.3.2 with: path: ~/.m2 key: ${{runner.os}}-m2 diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index e45549595..0f2cbe807 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -33,11 +33,11 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK ${{env.JDK}} - uses: actions/setup-java@v3.13.0 + uses: actions/setup-java@v4.2.1 with: java-version: ${{env.JDK}} - name: Maven Cache - uses: actions/cache@v3.3.1 + uses: actions/cache@v3.3.2 with: path: ~/.m2 key: ${{runner.os}}-m2 @@ -88,11 +88,11 @@ jobs: # steps: # - uses: actions/checkout@v4 # - name: Set up JDK ${{env.JDK}} -# uses: actions/setup-java@v3.13.0 +# uses: actions/setup-java@v4.2.1 # with: # java-version: ${{env.JDK}} # - name: Maven Cache -# uses: actions/cache@v3.3.1 +# uses: actions/cache@v3.3.2 # with: # path: ~/.m2 # key: ${{runner.os}}-m2 diff --git a/.gitignore b/.gitignore index 648e72e5b..d056a45f3 100644 --- a/.gitignore +++ b/.gitignore @@ -526,3 +526,4 @@ MigrationBackup/ FodyWeavers.xsd *.zip +.DS_Store diff --git a/docs/resources/MAQS.jpg b/docs/resources/MAQS.jpg index 39bad7877..e397158c6 100644 Binary files a/docs/resources/MAQS.jpg and b/docs/resources/MAQS.jpg differ diff --git a/docs/resources/MAQS.png b/docs/resources/MAQS.png index 39bad7877..a92aa97a9 100644 Binary files a/docs/resources/MAQS.png and b/docs/resources/MAQS.png differ diff --git a/docs/resources/MAQSDark.png b/docs/resources/MAQSDark.png index ffbcfdb60..a92aa97a9 100644 Binary files a/docs/resources/MAQSDark.png and b/docs/resources/MAQSDark.png differ diff --git a/docs/resources/maqsfull.jpg b/docs/resources/maqsfull.jpg index 9a56d5982..4183109c9 100644 Binary files a/docs/resources/maqsfull.jpg and b/docs/resources/maqsfull.jpg differ diff --git a/docs/resources/maqsfull.png b/docs/resources/maqsfull.png index c69d53724..4acb7822d 100644 Binary files a/docs/resources/maqsfull.png and b/docs/resources/maqsfull.png differ diff --git a/docs/resources/maqslogo.ico b/docs/resources/maqslogo.ico index 2e03e2c4b..a66bbc615 100644 Binary files a/docs/resources/maqslogo.ico and b/docs/resources/maqslogo.ico differ diff --git a/openmaqs-cucumber/config.xml b/openmaqs-cucumber/config.xml index 519afe4e7..bf998de2c 100644 --- a/openmaqs-cucumber/config.xml +++ b/openmaqs-cucumber/config.xml @@ -45,7 +45,7 @@ Chrome http://ondemand.saucelabs.com:80/wd/hub - http://magenicautomation.azurewebsites.net/ + https://openmaqs.github.io/TestingSite/Automation/ 1000 20000 Chrome @@ -72,7 +72,7 @@ - http://magenicautomation.azurewebsites.net + http://127.0.0.1:5026 10000 diff --git a/openmaqs-cucumber/src/test/java/stepdefs/selenium/SeleniumSteps.java b/openmaqs-cucumber/src/test/java/stepdefs/selenium/SeleniumSteps.java index e8cbfaf73..c12d3de00 100644 --- a/openmaqs-cucumber/src/test/java/stepdefs/selenium/SeleniumSteps.java +++ b/openmaqs-cucumber/src/test/java/stepdefs/selenium/SeleniumSteps.java @@ -6,12 +6,13 @@ import io.github.openmaqs.cucumber.steps.BaseSeleniumStep; import io.cucumber.java.en.Given; +import io.github.openmaqs.selenium.SeleniumConfig; public class SeleniumSteps extends BaseSeleniumStep { @Given("^Selenium Step$") public void Step() { - this.getDriver().navigate().to("https://magenicautomation.azurewebsites.net/"); + this.getDriver().navigate().to(SeleniumConfig.getWebSiteBase()); this.getLogger().logMessage("info"); } } diff --git a/openmaqs-utilities/pom.xml b/openmaqs-utilities/pom.xml index 4360609fe..69543623b 100644 --- a/openmaqs-utilities/pom.xml +++ b/openmaqs-utilities/pom.xml @@ -17,7 +17,7 @@ 2.11.0 - 2.8.0 + 2.10.1 1.9.4 1.10.0 1.15.3 diff --git a/pom.xml b/pom.xml index c571fb4bb..7c0965fb1 100644 --- a/pom.xml +++ b/pom.xml @@ -249,7 +249,7 @@ 0.8.7 7.8.0 4.14.1 - 5.6.0 + 5.8.0 release deploy