Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #19

Merged
merged 2 commits into from Feb 12, 2020
Merged

Develop #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be39934
bump pom versions
wildone Feb 12, 2020
d6711b8
update steps to yse step outputs
wildone Feb 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Expand Up @@ -84,13 +84,18 @@ jobs:
sudo apt-get install ansible libcurl4-openssl-dev libssl-dev socat default-jdk
python -m pip install --upgrade pip
pip install -r requirements.txt

- name: automation test
id: automation_test
run: ./automation-testing

- name: automation test release reports
if: github.ref == 'refs/heads/master'
run: ./automation-testing-release

env:
TEST_REPORT_OUTPUT: ${{ steps.automation_test.outputs.TEST_REPORT_OUTPUT }}
TEST_REPORT_COMPARE_SOURCES: ${{ steps.automation_test.outputs.TEST_REPORT_COMPARE_SOURCES }}
TEST_REPORT_GHPAGES_PATH: ${{ steps.automation_test.outputs.TEST_REPORT_GHPAGES_PATH }}

- name: deploy to maven cental
if: github.ref == 'refs/heads/master'
Expand Down
4 changes: 2 additions & 2 deletions aemdesign-aem-compose/pom.xml
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>design.aem</groupId>
<artifactId>aemdesign-aem-support</artifactId>
<version>2.0.255</version>
<version>2.0.292</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -18,7 +18,7 @@
<!-- ====================================================================== -->

<artifactId>aemdesign-aem-compose</artifactId>
<version>2.0.255</version>
<version>2.0.292</version>
<packaging>content-package</packaging>
<name>AEM Design - Support - Compose</name>
<description>Showcase and Styleguide for AEM Design project</description>
Expand Down
4 changes: 2 additions & 2 deletions aemdesign-aem-config/pom.xml
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>design.aem</groupId>
<artifactId>aemdesign-aem-support</artifactId>
<version>2.0.255</version>
<version>2.0.292</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -20,7 +20,7 @@
<packaging>content-package</packaging>
<name>AEM Design - Support - Config</name>
<description>AEM Configuration files for AEM Design project</description>
<version>2.0.255</version>
<version>2.0.292</version>

<developers>
<developer>
Expand Down
4 changes: 2 additions & 2 deletions aemdesign-aem-content/pom.xml
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>design.aem</groupId>
<artifactId>aemdesign-aem-support</artifactId>
<version>2.0.255</version>
<version>2.0.292</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -20,7 +20,7 @@
<packaging>content-package</packaging>
<name>AEM Design - Support - Content</name>
<description>Initial Content for AEM Design project</description>
<version>2.0.255</version>
<version>2.0.292</version>

<developers>
<developer>
Expand Down
4 changes: 2 additions & 2 deletions aemdesign-aem-showcase/pom.xml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>design.aem</groupId>
<artifactId>aemdesign-aem-support</artifactId>
<version>2.0.255</version>
<version>2.0.292</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -19,7 +19,7 @@
<packaging>content-package</packaging>
<name>AEM Design - Support - Showcase</name>
<description>Showcase package for AEM Design Components. Used for functional test and regression test</description>
<version>2.0.255</version>
<version>2.0.292</version>

<developers>
<developer>
Expand Down
4 changes: 2 additions & 2 deletions aemdesign-aem-support-deploy/pom.xml
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>design.aem</groupId>
<artifactId>aemdesign-aem-support</artifactId>
<version>2.0.255</version>
<version>2.0.292</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -20,7 +20,7 @@
<packaging>content-package</packaging>
<name>AEM Design - Support - Support Deploy</name>
<description>AEM package for deploying all packages as one</description>
<version>2.0.255</version>
<version>2.0.292</version>

<developers>
<developer>
Expand Down
4 changes: 2 additions & 2 deletions aemdesign-aem-training/pom.xml
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>design.aem</groupId>
<artifactId>aemdesign-aem-support</artifactId>
<version>2.0.255</version>
<version>2.0.292</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -20,7 +20,7 @@
<packaging>content-package</packaging>
<name>AEM Design - Support - AEM Training Content</name>
<description>AEM package with a user training site</description>
<version>2.0.255</version>
<version>2.0.292</version>

<developers>
<developer>
Expand Down
4 changes: 2 additions & 2 deletions aemdesign-testing/pom.xml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>design.aem</groupId>
<artifactId>aemdesign-aem-support</artifactId>
<version>2.0.255</version>
<version>2.0.292</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -16,7 +16,7 @@
<!-- ====================================================================== -->
<artifactId>aemdesign-testing</artifactId>
<packaging>jar</packaging>
<version>2.0.255</version>
<version>2.0.292</version>
<name>AEM Design - Support - Integration Testing</name>
<description>AEM Design Integration Tests for AEM</description>

Expand Down
17 changes: 11 additions & 6 deletions automation-testing
View file
Open in desktop
Expand Up @@ -73,11 +73,14 @@ if [[ ! -d "remote-seleniumhub-chrome/generated-docs/html" ]]; then
fi

export TEST_REPORT_OUTPUT="$(pwd)/remote-seleniumhub-chrome/generated-docs"
echo ::set-env name=TEST_REPORT_OUTPUT::${TEST_REPORT_OUTPUT}
echo REPORT PATH=$TEST_REPORT_OUTPUT
echo "::set-env name=TEST_REPORT_OUTPUT::${TEST_REPORT_OUTPUT}"
echo "::set-output name=TEST_REPORT_OUTPUT::${TEST_REPORT_OUTPUT}"
echo "::log-command TEST_REPORT_OUTPUT=${TEST_REPORT_OUTPUT}"
echo REPORT PATH=${TEST_REPORT_OUTPUT}

export TEST_REPORT_COMPARE_SOURCES="$(pwd)/src/test/screenshots"
echo ::set-env name=TEST_REPORT_COMPARE_SOURCES::${TEST_REPORT_COMPARE_SOURCES}
echo "::set-env name=TEST_REPORT_COMPARE_SOURCES::${TEST_REPORT_COMPARE_SOURCES}"
echo "::set-output name=TEST_REPORT_COMPARE_SOURCES::${TEST_REPORT_COMPARE_SOURCES}"
echo REPORT COMPARE SOURCES PATH=$TEST_REPORT_COMPARE_SOURCES

echo BUILD DIR FOR PUBLISH RESULTS
Expand All @@ -92,8 +95,10 @@ echo CLONE OUTPUT REPO
cd ${PATH_GHPAGES}

export TEST_REPORT_GHPAGES_PATH="$(pwd)"
echo ::set-env name=TEST_REPORT_GHPAGES_PATH::${TEST_REPORT_GHPAGES_PATH}
echo OUTPUT REPO=$TEST_REPORT_GHPAGES_PATH
echo "::set-env name=TEST_REPORT_GHPAGES_PATH::${TEST_REPORT_GHPAGES_PATH}"
echo "::set-output name=TEST_REPORT_GHPAGES_PATH::${TEST_REPORT_GHPAGES_PATH}"
echo OUTPUT REPO=${TEST_REPORT_GHPAGES_PATH}

export TEST_REPORT_COMMENT="$(git rev-parse HEAD)"
echo ::set-env name=TEST_REPORT_COMMENT::${TEST_REPORT_COMMENT}
echo "::set-env name=TEST_REPORT_COMMENT::${TEST_REPORT_COMMENT}"
echo "::set-output name=TEST_REPORT_COMMENT::${TEST_REPORT_COMMENT}"
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@

<groupId>design.aem</groupId>
<artifactId>aemdesign-aem-support</artifactId>
<version>2.0.255</version>
<version>2.0.292</version>
<packaging>pom</packaging>

<name>AEM Design - Support Project</name>
Expand Down