actions/setup-java
2
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-04-20 09:56:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

changed passhprase configuration to be more in line with docs

Browse source
This commit is contained in:
Jared Petersen 2020-05-03 08:22:31 -07:00
parent 9098ec5f8b
commit 1d7ec38fd8
4 changed files with 20 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

28
README.md
View file

@ -134,16 +134,10 @@ The two `settings.xml` files created from the above example look like the follow
<username>${env.GITHUB_ACTOR}</username> <username>${env.GITHUB_ACTOR}</username>
<password>${env.GITHUB_TOKEN}</password> <password>${env.GITHUB_TOKEN}</password>
</server> </server>
<profiles> <server>
<profile> <id>gpg.passphrase</id>
<activation> <passphrase>${env.GPG_PASSPHRASE}</passphrase>
<activeByDefault>true</activeByDefault> </server>
</activation>
<properties>
<gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
</properties>
</profile>
<profiles>
</servers> </servers>
``` ```
@ -155,16 +149,10 @@ The two `settings.xml` files created from the above example look like the follow
<username>${env.MAVEN_USERNAME}</username> <username>${env.MAVEN_USERNAME}</username>
<password>${env.MAVEN_CENTRAL_TOKEN}</password> <password>${env.MAVEN_CENTRAL_TOKEN}</password>
</server> </server>
<profiles> <server>
<profile> <id>gpg.passphrase</id>
<activation> <passphrase>${env.MAVEN_GPG_PASSPHRASE}</passphrase>
<activeByDefault>true</activeByDefault> </server>
</activation>
<properties>
<gpg.passphrase>${env.MAVEN_GPG_PASSPHRASE}</gpg.passphrase>
</properties>
</profile>
<profiles>
</servers> </servers>
``` ```

14
__tests__/auth.test.ts
View file

@ -157,17 +157,11 @@ describe('auth tests', () => {
<username>\${env.${username}}</username> <username>\${env.${username}}</username>
<password>\${env.&amp;&lt;&gt;&quot;&apos;&apos;&quot;&gt;&lt;&amp;}</password> <password>\${env.&amp;&lt;&gt;&quot;&apos;&apos;&quot;&gt;&lt;&amp;}</password>
</server> </server>
<server>
<id>gpg.passphrase</id>
<passphrase>\${env.${gpgPassphrase}}</passphrase>
</server>
</servers> </servers>
<profiles>
<profile>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<gpg.passphrase>\${env.${gpgPassphrase}}</gpg.passphrase>
</properties>
</profile>
</profiles>
</settings> </settings>
`); `);
}); });

14
dist/index.js generated vendored
View file

@ -2928,17 +2928,11 @@ function generate(id = exports.DEFAULT_ID, username = exports.DEFAULT_USERNAME,
<username>\${env.${escapeXML(username)}}</username> <username>\${env.${escapeXML(username)}}</username>
<password>\${env.${escapeXML(password)}}</password> <password>\${env.${escapeXML(password)}}</password>
</server> </server>
<server>
<id>gpg.passphrase</id>
<passphrase>\${env.${escapeXML(gpgPassphrase)}}</passphrase>
</server>
</servers> </servers>
<profiles>
<profile>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<gpg.passphrase>\${env.${escapeXML(gpgPassphrase)}}</gpg.passphrase>
</properties>
</profile>
</profiles>
</settings> </settings>
`; `;
} }

14
src/auth.ts
View file

@ -82,17 +82,11 @@ export function generate(
<username>\${env.${escapeXML(username)}}</username> <username>\${env.${escapeXML(username)}}</username>
<password>\${env.${escapeXML(password)}}</password> <password>\${env.${escapeXML(password)}}</password>
</server> </server>
<server>
<id>gpg.passphrase</id>
<passphrase>\${env.${escapeXML(gpgPassphrase)}}</passphrase>
</server>
</servers> </servers>
<profiles>
<profile>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<gpg.passphrase>\${env.${escapeXML(gpgPassphrase)}}</gpg.passphrase>
</properties>
</profile>
</profiles>
</settings> </settings>
`; `;
} }