Skip to content

Commit

Permalink
Change node from version 12 to version 16 (#117)
Browse files Browse the repository at this point in the history
* #116: updates to remove workflow warning

* Try set default Java version to Temurin 17

* #116, #112 (comment): fixed warning and test execution
  • Loading branch information
masesdevelopers authored Nov 9, 2022
1 parent d425391 commit c1c9fe1
Show file tree
Hide file tree
Showing 7 changed files with 74 additions and 60 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 2

Expand All @@ -31,25 +31,25 @@ jobs:
echo "=============== list changed files ==============="
git diff --name-only HEAD^ HEAD
echo "::set-output name=run_job::false"
echo "run_job=false" >> $GITHUB_OUTPUT
echo "========== check paths of changed files =========="
git diff --name-only HEAD^ HEAD > files.txt
while IFS= read -r file
do
echo $file
if [[ $file == "netreflected/docs/README.md"* ]]; then
echo "Recreate docs was requested"
echo "::set-output name=run_job::true"
echo "run_job=true" >> $GITHUB_OUTPUT
break
fi
if [[ $file == ".github/workflows/docs.yaml"* ]]; then
echo "Recreate docs was requested"
echo "::set-output name=run_job::true"
echo "run_job=true" >> $GITHUB_OUTPUT
break
fi
if [[ $file == "netreflected/src/"* ]]; then
echo "This file is under the directory 'netreflected/src/'."
echo "::set-output name=run_job::true"
echo "run_job=true" >> $GITHUB_OUTPUT
break
fi
echo "This files are not in a source directory no action required"
Expand All @@ -70,7 +70,7 @@ jobs:
run: git config --system core.longpaths true

# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
persist-credentials: false
submodules: 'true'
Expand Down
22 changes: 14 additions & 8 deletions .github/workflows/linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 2

Expand All @@ -31,25 +31,25 @@ jobs:
echo "=============== list changed files ==============="
git diff --name-only HEAD^ HEAD
echo "::set-output name=run_job::false"
echo "run_job=false" >> $GITHUB_OUTPUT
echo "========== check paths of changed files =========="
git diff --name-only HEAD^ HEAD > files.txt
while IFS= read -r file
do
echo $file
if [[ $file == ".github/workflows/linux.yaml"* ]]; then
echo "This file is under the directory '.github/workflows/linux.yaml'."
echo "::set-output name=run_job::true"
echo "run_job=true" >> $GITHUB_OUTPUT
break
fi
if [[ $file == "netreflected/src/"* ]]; then
echo "This file is under the directory 'netreflected/src'."
echo "::set-output name=run_job::true"
echo "run_job=true" >> $GITHUB_OUTPUT
break
fi
if [[ $file == "netreflected-tests/"* ]]; then
echo "This file is under the directory 'netreflected-tests/'."
echo "::set-output name=run_job::true"
echo "run_job=true" >> $GITHUB_OUTPUT
break
fi
echo "This files are not in a source directory no action required"
Expand All @@ -65,7 +65,7 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: '1'

Expand All @@ -75,12 +75,12 @@ jobs:

# Install .NET SDKs
- name: Setup .NET Core 3.1
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: 3.1.x

- name: Setup .NET 6.0
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x

Expand All @@ -100,6 +100,12 @@ jobs:
dotnet bin/netcoreapp3.1/MASES.JCOReflectorCLI.dll -JobType CreateJars -JDKFolder /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/ -JobFile .github/workflows/createjars_core3.1_linux.job
dotnet bin/net6.0/MASES.JCOReflectorCLI.dll -JobType CreateJars -JDKFolder /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/ -JobFile .github/workflows/createjars_core6.0_linux.job
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
cache: 'maven'

- name: Build Java test source file .NET Core 3.1
run: javac -cp ./bin/netcoreapp3.1/JCOReflector.jar ./netreflected-tests/java/src/hierarchy/*.java ./netreflected-tests/java/src/mscorlib/*.java ./netreflected-tests/java/src/nettest/*.java ./netreflected-tests/java/src/refout/*.java

Expand Down
24 changes: 9 additions & 15 deletions .github/workflows/maven.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 2

Expand All @@ -31,25 +31,25 @@ jobs:
echo "=============== list changed files ==============="
git diff --name-only HEAD^ HEAD
echo "::set-output name=run_job::false"
echo "run_job=false" >> $GITHUB_OUTPUT
echo "========== check paths of changed files =========="
git diff --name-only HEAD^ HEAD > files.txt
while IFS= read -r file
do
echo $file
if [[ $file == ".github/workflows/maven.yaml"* ]]; then
echo "A change in workflow was made, a run is requested"
echo "::set-output name=run_job::true"
echo "run_job=true" >> $GITHUB_OUTPUT
break
fi
if [[ $file == "src/engine/JCOPOMJCOReflector.template"* ]]; then
echo "A change in template was made, a run is requested"
echo "::set-output name=run_job::true"
echo "run_job=true" >> $GITHUB_OUTPUT
break
fi
if [[ $file == "netreflected/src/"* ]]; then
echo "This file is under the directory 'netreflected/src/'."
echo "::set-output name=run_job::true"
echo "run_job=true" >> $GITHUB_OUTPUT
break
fi
echo "This files are not in a source directory no action required"
Expand All @@ -70,15 +70,7 @@ jobs:
run: git config --system core.longpaths true

# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- name: Cache local Maven repository
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- uses: actions/checkout@v3

- name: Install gpg secret key
run: |
Expand All @@ -104,9 +96,11 @@ jobs:
run: .\bin\net462\MASES.JCOReflectorCLI -JobType CreatePOM -JobFile .github\workflows\createpom_win19.job

- name: Set up Apache Maven Central
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with: # running setup-java again overwrites the settings.xml
distribution: temurin
java-version: 11
cache: 'maven'
server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
server-username: MAVEN_USERNAME # env variable for username in deploy
server-password: MAVEN_CENTRAL_TOKEN # env variable for token in deploy
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pullrequests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@ jobs:
for added_modified_file in "${added_modified_files[@]}"; do
if [[ $added_modified_file == ".github/workflows/pullrequests.yaml"* ]]; then
echo "$added_modified_file is under the directory '.github/workflows'."
echo "::set-output name=run_job::true"
echo "run_job=true" >> $GITHUB_OUTPUT
break
fi
if [[ $added_modified_file == "netreflected/src/JCOReflector/"* ]]; then
echo "$added_modified_file is under the directory 'netreflected/src/JCOReflector'."
echo "::set-output name=run_job::true"
echo "run_job=true" >> $GITHUB_OUTPUT
break
fi
if [[ $added_modified_file == "src/"* ]]; then
echo "$added_modified_file is under the directory 'src/'."
echo "::set-output name=run_job::true"
echo "run_job=true" >> $GITHUB_OUTPUT
break
fi
if [[ $added_modified_file == "netreflected-tests/"* ]]; then
echo "$added_modified_file is under the directory 'netreflected-tests/'."
echo "::set-output name=run_job::true"
echo "run_job=true" >> $GITHUB_OUTPUT
break
fi
done
Expand All @@ -67,15 +67,15 @@ jobs:
run: git config --system core.longpaths true

# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: '1'

# Runs a set of commands using the runners shell
- name: Build JCOReflectorCLI
run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\JCOReflectorCLI.sln

- uses: nuget/setup-nuget@v1
- uses: nuget/setup-nuget@v1.1.1
with:
nuget-version: '5.x'

Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ jobs:
run: git config --system core.longpaths true

# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: 'true'

# Runs a set of commands using the runners shell
- name: Build JCOReflectorCLI
run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\JCOReflectorCLI.sln

- uses: nuget/setup-nuget@v1
- uses: nuget/setup-nuget@v1.1.1
with:
nuget-version: '5.x'

Expand All @@ -51,9 +51,11 @@ jobs:
run: .\bin\net462\MASES.JCOReflectorCLI -JobType CreatePOM -POMStagingType Release -JobFile .github\workflows\createpom_win19.job

- name: Set up Apache Maven Central
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with: # running setup-java again overwrites the settings.xml
distribution: temurin
java-version: 11
cache: 'maven'
server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
server-username: MAVEN_USERNAME # env variable for username in deploy
server-password: MAVEN_CENTRAL_TOKEN # env variable for token in deploy
Expand Down
20 changes: 13 additions & 7 deletions .github/workflows/testbranch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,22 @@ jobs:
for added_modified_file in "${added_modified_files[@]}"; do
if [[ $added_modified_file == ".github/workflows/testbranch.yaml"* ]]; then
echo "$added_modified_file is under the directory '.github/workflows'."
echo "::set-output name=run_job::true"
echo "run_job=true" >> $GITHUB_OUTPUT
break
fi
if [[ $added_modified_file == "netreflected/src/JCOReflector/"* ]]; then
echo "$added_modified_file is under the directory 'netreflected/src/JCOReflector'."
echo "::set-output name=run_job::true"
echo "run_job=true" >> $GITHUB_OUTPUT
break
fi
if [[ $added_modified_file == "src/"* ]]; then
echo "$added_modified_file is under the directory 'src/'."
echo "::set-output name=run_job::true"
echo "run_job=true" >> $GITHUB_OUTPUT
break
fi
if [[ $added_modified_file == "netreflected-tests/"* ]]; then
echo "$added_modified_file is under the directory 'netreflected-tests/'."
echo "::set-output name=run_job::true"
echo "run_job=true" >> $GITHUB_OUTPUT
break
fi
done
Expand All @@ -69,7 +69,7 @@ jobs:
run: git config --system core.longpaths true

# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: '1'

Expand All @@ -84,7 +84,7 @@ jobs:
- name: Build JCOReflectorCLI
run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\JCOReflectorCLI.sln

- uses: nuget/setup-nuget@v1
- uses: nuget/setup-nuget@v1.1.1
with:
nuget-version: '5.x'

Expand Down Expand Up @@ -171,7 +171,13 @@ jobs:
name: LatestSource
path: .\netreflected\source.zip
retention-days: 1


- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
cache: 'maven'

- name: Build Java test source file .NET Core 3.1
run: javac -cp ./bin/netcoreapp3.1/JCOReflector.jar ./netreflected-tests/java/src/hierarchy/*.java ./netreflected-tests/java/src/mscorlib/*.java ./netreflected-tests/java/src/nettest/*.java ./netreflected-tests/java/src/refout/*.java

Expand Down
Loading

0 comments on commit c1c9fe1

Please sign in to comment.