-
Notifications
You must be signed in to change notification settings - Fork 9
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.
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
Build the site when something is pushed to main, or on PRs #9
Draft
niloc132
wants to merge
11
commits into
gwtproject:main
Choose a base branch
from
niloc132:github-actions
base: main
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
f155734
Stop producing a maven war, instead use ltgt gwt plugin
niloc132 87a28be
Update to GWT 2.8.2, with a beta gquery and inference fix
niloc132 7d155db
Upgrade to GWT 2.9.0, with a temporary workaround for gwt#9694
niloc132 d2e12bd
Update readme, require md only for local tests
niloc132 28b337a
Latest gwt-m-p, and use strict mode
niloc132 0ea2e0c
Build the site when something is pushed to main, or on PRs
niloc132 26a4b3d
Update this assuming other fixes are made, modernize it
niloc132 843f4b4
Build on all pushes, to test this branch
niloc132 d847525
update setup-java, and be sure to checkout code before setting up
niloc132 85b5bf5
Restore only building main
niloc132 0a91c0d
(belated) review feedback
niloc132 File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
name: Build gwt-site-webapp | ||
on: | ||
push: | ||
pull_request: | ||
|
||
jobs: | ||
build: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v3 | ||
- name: Set up Java | ||
uses: actions/setup-java@v3 | ||
with: | ||
java-version: '11' | ||
distribution: 'temurin' | ||
cache: 'maven' | ||
|
||
- name: Compile the webapp to JS | ||
run: mvn --batch-mode --no-transfer-progress -e verify | ||
|
||
- name: Upload the generated JS | ||
uses: actions/upload-artifact@v3 | ||
with: | ||
name: 'gwt-site-webapp' | ||
path: target/gwt-site-webapp-*/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,21 +6,20 @@ | |
<groupId>com.google.gwt.site.webapp</groupId> | ||
<artifactId>gwt-site-webapp</artifactId> | ||
<version>2.0-SNAPSHOT</version> | ||
<packaging>war</packaging> | ||
<packaging>gwt-app</packaging> | ||
|
||
<properties> | ||
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format> | ||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
|
||
<gwt.version>2.7.0</gwt.version> | ||
<gwtquery.version>1.4.2</gwtquery.version> | ||
<gwt.version>2.9.0</gwt.version> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Move to using the BOM? |
||
<gwtquery.version>1.5-beta1</gwtquery.version> | ||
|
||
<junit.version>4.11</junit.version> | ||
|
||
<!-- plugin --> | ||
<surefire-plugin.version>2.17</surefire-plugin.version> | ||
<compiler-plugin.version>3.1</compiler-plugin.version> | ||
<war-plugin.version>2.4</war-plugin.version> | ||
</properties> | ||
|
||
<dependencies> | ||
|
@@ -37,27 +36,17 @@ | |
<groupId>com.google.gwt</groupId> | ||
<artifactId>gwt-user</artifactId> | ||
<version>${gwt.version}</version> | ||
<scope>provided</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.googlecode.gwtquery</groupId> | ||
<artifactId>gwtquery</artifactId> | ||
<version>${gwtquery.version}</version> | ||
<scope>provided</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.google.gwt</groupId> | ||
<artifactId>gwt-dev</artifactId> | ||
<version>${gwt.version}</version> | ||
<scope>provided</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.google.gwt.site</groupId> | ||
<artifactId>gwt-site</artifactId> | ||
<version>${project.version}</version> | ||
<type>zip</type> | ||
<classifier>generated-site</classifier> | ||
</dependency> | ||
</dependencies> | ||
|
||
<build> | ||
|
@@ -68,17 +57,6 @@ | |
</testResources> | ||
|
||
<plugins> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-surefire-plugin</artifactId> | ||
<version>${surefire-plugin.version}</version> | ||
<configuration> | ||
<excludes> | ||
<exclude>**/*GwtTest.java</exclude> | ||
</excludes> | ||
</configuration> | ||
</plugin> | ||
|
||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-compiler-plugin</artifactId> | ||
|
@@ -90,90 +68,56 @@ | |
</plugin> | ||
|
||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-war-plugin</artifactId> | ||
<version>${war-plugin.version}</version> | ||
<groupId>net.ltgt.gwt.maven</groupId> | ||
<artifactId>gwt-maven-plugin</artifactId> | ||
<version>1.0.1</version> | ||
<extensions>true</extensions> | ||
<configuration> | ||
<!-- <archiveClasses>true</archiveClasses> --> | ||
<webResources> | ||
<!-- copy GWT source code to website for debugging --> | ||
<resource> | ||
<directory>${basedir}/target/extra/gwtproject/src</directory> | ||
<targetPath>src</targetPath> | ||
</resource> | ||
<!-- copy sourcemaps to website for debugging --> | ||
<resource> | ||
<directory>${basedir}/target/extra/gwtproject/symbolMaps</directory> | ||
<includes> | ||
<include>*.json</include> | ||
</includes> | ||
<targetPath>src</targetPath> | ||
</resource> | ||
</webResources> | ||
<moduleName>com.google.gwt.site.webapp.GWTProject</moduleName> | ||
<compilerArgs> | ||
<arg>-saveSource</arg> | ||
</compilerArgs> | ||
<!-- | ||
Draft and pretty mode are turned on so that beginners can try out debugging | ||
in their browser with no setup. | ||
Please don't disable this; code size is less important. | ||
--> | ||
<draftCompile>true</draftCompile> | ||
<style>PRETTY</style> | ||
<failOnError>true</failOnError> | ||
<launcherDir>${project.build.directory}/www</launcherDir> | ||
<extra>${project.build.directory}/extra</extra> | ||
<includes> | ||
<include>**/*Test.java</include> | ||
</includes> | ||
<enableAssertions>false</enableAssertions> | ||
</configuration> | ||
</plugin> | ||
|
||
<plugin> | ||
<groupId>org.codehaus.mojo</groupId> | ||
<artifactId>gwt-maven-plugin</artifactId> | ||
<version>${gwt.version}</version> | ||
<executions> | ||
<execution> | ||
<configuration> | ||
<testTimeOut>180</testTimeOut> | ||
<includes>**/*GwtTest.java</includes> | ||
<mode>htmlunit</mode> | ||
<gen>gen</gen> | ||
<extraJvmArgs>-Xss1024k -Xmx512M -XX:MaxPermSize=512m</extraJvmArgs> | ||
<saveSource>true</saveSource> | ||
<module>com.google.gwt.site.webapp.GWTProject</module> | ||
<!-- | ||
Draft and pretty mode are turned on so that beginners can try out debugging | ||
in their browser with no setup. | ||
Please don't disable this; code size is less important. | ||
--> | ||
niloc132 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
<draftCompile>true</draftCompile> | ||
<style>PRETTY</style> | ||
</configuration> | ||
<goals> | ||
<goal>compile</goal> | ||
<goal>test</goal> | ||
</goals> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
<plugin> | ||
<artifactId>maven-dependency-plugin</artifactId> | ||
<executions> | ||
<execution> | ||
<id>unpack-dependencies</id> | ||
<phase>prepare-package</phase> | ||
<goals> | ||
<goal>unpack-dependencies</goal> | ||
</goals> | ||
<configuration> | ||
<includeGroupIds>com.google.gwt.site</includeGroupIds> | ||
<includeArtifactIds>gwt-site</includeArtifactIds> | ||
<excludeTransitive>true</excludeTransitive> | ||
<outputDirectory>${project.build.directory}/www/</outputDirectory> | ||
</configuration> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
<plugin> | ||
<artifactId>maven-resources-plugin</artifactId> | ||
<executions> | ||
<execution> | ||
<id>copy-resources</id> | ||
<!-- Copy results necessary for sourcemaps to work to the packaging output --> | ||
<id>copy-sourcemap-resources</id> | ||
<phase>prepare-package</phase> | ||
<goals> | ||
<goal>copy-resources</goal> | ||
</goals> | ||
<configuration> | ||
<outputDirectory>${project.build.directory}/www/gwtproject/</outputDirectory> | ||
<outputDirectory>${project.build.directory}/${project.build.finalName}/</outputDirectory> | ||
<resources> | ||
<!-- copy GWT source code to website for debugging --> | ||
<resource> | ||
<directory>${project.build.directory}/extra/gwtproject/src</directory> | ||
<targetPath>src</targetPath> | ||
</resource> | ||
<!-- copy sourcemaps to website for debugging --> | ||
<resource> | ||
<directory>${project.build.directory}/${project.artifactId}-${project.version}/gwtproject/</directory> | ||
<directory>${project.build.directory}/extra/gwtproject/symbolMaps</directory> | ||
<includes> | ||
<include>*.json</include> | ||
</includes> | ||
<targetPath>src</targetPath> | ||
</resource> | ||
</resources> | ||
</configuration> | ||
|
@@ -182,4 +126,65 @@ | |
</plugin> | ||
</plugins> | ||
</build> | ||
<profiles> | ||
<profile> | ||
<!-- | ||
Generates a full working site for testing, by unpacking the | ||
markdown along with this project's own output. | ||
--> | ||
<id>full-site</id> | ||
<dependencies> | ||
<dependency> | ||
<groupId>com.google.gwt.site</groupId> | ||
<artifactId>gwt-site</artifactId> | ||
<version>${project.version}</version> | ||
<type>zip</type> | ||
<classifier>generated-site</classifier> | ||
</dependency> | ||
</dependencies> | ||
<build> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-dependency-plugin</artifactId> | ||
<executions> | ||
<execution> | ||
<id>unpack-dependencies</id> | ||
<phase>prepare-package</phase> | ||
<goals> | ||
<goal>unpack-dependencies</goal> | ||
</goals> | ||
<configuration> | ||
<includeGroupIds>com.google.gwt.site</includeGroupIds> | ||
<includeArtifactIds>gwt-site</includeArtifactIds> | ||
<excludeTransitive>true</excludeTransitive> | ||
<outputDirectory>${project.build.directory}/www/</outputDirectory> | ||
</configuration> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
<plugin> | ||
<artifactId>maven-resources-plugin</artifactId> | ||
<executions> | ||
<execution> | ||
<!-- Along with the dependency:unpack-dependencies, this generates a complete site to test with --> | ||
<id>copy-www-resources</id> | ||
<phase>prepare-package</phase> | ||
<goals> | ||
<goal>copy-resources</goal> | ||
</goals> | ||
<configuration> | ||
<outputDirectory>${project.build.directory}/www/</outputDirectory> | ||
<resources> | ||
<resource> | ||
<directory>${project.build.directory}/${project.build.finalName}/</directory> | ||
</resource> | ||
</resources> | ||
</configuration> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
</profile> | ||
</profiles> | ||
</project> |
12 changes: 0 additions & 12 deletions
12
src/main/java/com/google/gwt/site/webapp/GWTProjectSuperDevMode.gwt.xml
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't the
full-site
profile be mentioned somewhere in the README?