Commit graph

27 commits

Author SHA1 Message Date
Markus Hoffrogge
cfa3d8b1c2 Update from npm run format to fix prettier check
- missed in initial commit
- took re-built dist from GH actions
2023-11-08 11:59:16 +01:00
Markus Hoffrogge
b0ca944fe9 Add inputs 'update-toolchains-only', 'update-env-javahome', 'add-to-env-path'
Changes in detail:
------------------
- action.yml:
  - add inputs:
    - update-toolchains-only
    - update-env-javahome
    - add-to-env-path
  - update description for input "overwrite-settings"
  - remove default value of input "overwrite-settings",
    since the default is now propagated from input 'update-toolchains-only'

- base-models.ts:
  - extend interface JavaInstallerOptions:
    - add fields:
      - updateEnvJavaHome: boolean;
      - addToEnvPath: boolean;

- constants.ts:
  - add constant INPUT_UPDATE_TOOLCHAINS_ONLY
    = 'update-toolchains-only'

- auth.ts:
  - function configureAuthentication():
    - add parameter:
      - overwriteSettings: boolean
    - remove the now obsolete const overwriteSettings

- toolchains.ts:
  - function configureToolchains(...):
    - add parameter updateToolchains: boolean
    - remove the now obsolete const overwriteSettings
  - improve variable naming:
    - rename any occurrence of 'overwriteSettings'
        by 'updateToolchains'
    - add field updateToolchains: boolean to the parameter object
  - function writeToolchainsFileToDisk(...):
    - improve variable naming:
      - rename variable 'settingsExists'
          by 'toolchainsExists'
    - update wording of info logs to be more applicable

- setup-java.ts:
  - interface installerInputsOptions:
    - rename to IInstallerInputsOption to meet common coding convention
    - add fields:
      - updateToolchainsOnly: boolean;
      - overwriteSettings: boolean;
      - updateEnvJavaHome: boolean;
      - addToEnvPath: boolean;
  - function run():
    - add const:
      - const updateToolchainsOnly:
        - get as boolean from input 'update-toolchains-only', default: false
      - const overwriteSettings:
        - get as boolean from input 'overwrite-settings', default: !updateToolchainsOnly
      - const updateEnvJavaHome:
        - get as boolean input 'update-env-javahome', default: !updateToolchainsOnly
      - const addToEnvPath:
        - get as boolean input 'add-to-env-path', default: !updateToolchainsOnly
   - extend const installerInputsOptions to match with IInstallerInputsOption:
      - add field updateToolchainsOnly
      - add field overwriteSettings
      - add field updateEnvJavaHome
      - add field addToEnvPath
    - update call of auth.configureAuthentication()
        to auth.configureAuthentication(overwriteSettings)
  - function installVersion(...):
    - add const and init from parameter options:
      - updateToolchainsOnly, overwriteSettings,
        updateEnvJavaHome, addToEnvPath
    - init the additional fields of installerInputsOptions accordingly
    - call toolchains.configureToolchains(...):
      - with parameter updateToolchains= overwriteSettings || updateToolchainsOnly

- base-installer.ts:
  - add constants to import from constants:
    - INPUT_UPDATE_JAVA_HOME
    - INPUT_ADD_TO_PATH
  - add fields:
    - protected updateEnvJavaHome: boolean;
    - protected addToEnvPath: boolean;
  - ctor:
    - init these fields from JavaInstallerOptions accoprdingly
  - function setJavaDefault(...):
    - if updateEnvJavaHome is false:
      - SKIP updating env.JAVA_HOME
      - log info:
        `Skip updating env.JAVA_HOME according to ${INPUT_UPDATE_JAVA_HOME}`
    - if addToEnvPath is false:
      - SKIP adding toolchain path to env.PATH
      - log info:
        `Skip adding to env.PATH according to ${INPUT_ADD_TO_PATH}`
2023-11-07 00:27:36 +01:00
Ivan
0de5c66fc0
Add and configure ESLint and update configuration for Prettier (#458)
* Add ESLint config and update Prettier

* Update test files

* Rebuild action

* Update docs

* Update licenses

* Update tsconfig

* Rebuild action

* Update tsconfig.json

* Fix console.time calls

* Rebuild action

* Rebuild action on Linux
2023-03-09 14:49:35 +02:00
Nikolas Grottendieck
eb1418aa81
Add Maven Toolchains Declaration (#276)
* Add (optional) Maven Toolchains Declaration after JDK is installed
* Extract common/shared Maven constants

Resolves #276
2022-09-27 17:25:52 +02:00
Maxim Lobanov
b53500dabc
Merge "v2-preview" branch into "main" (#150)
* actions/setup-java@v2 - Support different distributions (#132)

* Implement support for custom vendors in setup-java

* minor improvements

* minor refactoring

* Add unit tests and e2e tests

* Update documentation for setup-java@v2 release

* minor improvements

* regenerate dist

* fix comments

* resolve comments

* resolve comments

* fix tests

* Update README.md

Co-authored-by: George Adams <george.adams@microsoft.com>

* Apply suggestions from code review

Co-authored-by: Konrad Pabjan <konradpabjan@github.com>

* fix minor nitpicks

* handle 4th digit

* pull latest main

* Update README.md

* rename adoptium to adopt

* rename adoptium to adopt

* rename adoptium to adopt

* Update README.md

* make java-version and distribution required for action

* update readme

* fix tests

* fix e2e tests

Co-authored-by: George Adams <george.adams@microsoft.com>
Co-authored-by: Konrad Pabjan <konradpabjan@github.com>

* Add "overwrite-settings" input parameter (#136)

* add overwrite-settings parameter

* fix e2e tests

* print debug

* fix e2e tests

* add comment

* remove comment

* Add "Contents/Home" postfix on macOS if provider creates it (#139)

* Update e2e-versions.yml

* Update e2e-versions.yml

* implement fix

* Update e2e-versions.yml

* Update installer.ts

* fix filter logic

* Update e2e-versions.yml

* remove extra logic

* Update e2e-versions.yml

* Add check-latest flag (#141)

* add changes for check-latest

* run prerelease script

* resolving comments

* fixing tests

* fix spelling

* improve core.info messages

* run format

* run prerelease

* change version to fix test

* resolve comment for check-latest

* Update README.md

* added hosted tool cache section

* Apply suggestions from code review

Co-authored-by: Maxim Lobanov <v-malob@microsoft.com>
Co-authored-by: Konrad Pabjan <konradpabjan@github.com>

* Avoid "+" sign in Java path in v2-preview (#145)

* try to handle _ versions

* more logs

* more debug

* test 1

* more fixes

* fix typo

* Update e2e-versions.yml

* add unit-tests

* remove debug info from tests

* debug pre-cached versions

* change e2e tests to ubuntu-latest

* update npm licenses

Co-authored-by: George Adams <george.adams@microsoft.com>
Co-authored-by: Konrad Pabjan <konradpabjan@github.com>
Co-authored-by: Dmitry Shibanov <dmitry-shibanov@github.com>
2021-04-05 13:02:27 +03:00
Jared Petersen
91d166793d added blurb about private key file and cleanup for hosted runners 2020-07-15 20:16:31 -06:00
Jared Petersen
d94db22179 Added support for GPG 2020-05-15 23:40:06 -07:00
Bryan Clark
1bba665156 Try env variables 2019-12-19 11:28:11 -08:00
Bryan Clark
6924f73ee0 Address latest review feedback 2019-12-19 08:52:26 -08:00
Bryan Clark
ce88feea94 Move to settings-path 2019-12-10 13:02:21 -08:00
Bryan Clark
ae11e1a1b6 Allow for alternate settings.xml file location
Use the m2-home to specify a new location for the settings.xml file
2019-12-10 10:03:33 -08:00
Bryan Clark
551e2a2770 sanitzie XML characters 2019-12-10 09:26:51 -08:00
Bryan Clark
4b6ff8caf0 Format auth 2019-12-06 14:32:51 -05:00
Bryan Clark
8940139ee8 Be explicit about second flag 2019-12-06 14:28:34 -05:00
Bryan Clark
5e29577d7b Remote options from log 2019-12-06 14:28:17 -05:00
Bryan Clark
1dac4fef05 Use $HOME directory 2019-12-06 14:25:41 -05:00
Bryan Clark
797045350f code == EEXIST 2019-12-05 00:54:26 -05:00
Bryan Clark
948db7588e strringify the logs 2019-12-05 00:48:15 -05:00
Bryan Clark
2b05c00514 logging code 2019-12-05 00:45:56 -05:00
Bryan Clark
96236d7072 return but shoudl still fail 2019-12-05 00:43:41 -05:00
Bryan Clark
12896dfb0f logging options 2019-12-05 00:41:50 -05:00
Bryan Clark
bfbec53132 log when we overwrite the file 2019-12-04 23:54:21 -05:00
Bryan Clark
b8a0027e2c Use console.log where appropriate 2019-11-28 13:35:47 -08:00
Bryan Clark
dc5f78f54d generated and pretty files 2019-11-28 13:35:47 -08:00
Bryan Clark
b0e5cf270d Support ids 2019-11-28 13:35:47 -08:00
Bryan Clark
56eacf97f5 move required parameters to auth module
username and password are required from within the auth module now.  Update the tests to ensure this is the case.
2019-11-28 13:35:47 -08:00
Bryan Clark
a3e6ce2153 Adding maven auth support 2019-11-28 13:35:47 -08:00