Skip to content

Commit 2ecf01b

Browse files
nickmatsnevGitHub Enterprise
authored andcommitted
Merge pull request #1 from API-Developer-Portal/DEVPORTAL-672-uoe
Devportal 672 uoe
2 parents de09598 + 799da98 commit 2ecf01b

35 files changed

+1115
-481
lines changed

.github/workflows/chores.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
debug:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-20.04
1414
steps:
1515
- name: Dump GitHub context
1616
env:
@@ -38,7 +38,7 @@ jobs:
3838
run: echo "$MATRIX_CONTEXT"
3939
chores:
4040
name: Chores
41-
runs-on: ubuntu-latest
41+
runs-on: ubuntu-20.04
4242
steps:
4343
- name: Checkout repository
4444
uses: actions/checkout@v3

.github/workflows/codeql-analysis.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
debug:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-20.04
1414
steps:
1515
- name: Dump GitHub context
1616
env:
@@ -38,7 +38,7 @@ jobs:
3838
run: echo "$MATRIX_CONTEXT"
3939
analyze:
4040
name: Analyze
41-
runs-on: ubuntu-latest
41+
runs-on: ubuntu-20.04
4242
steps:
4343
- name: Checkout repository
4444
uses: actions/checkout@v3

.github/workflows/main.yaml

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010

1111
jobs:
1212
debug:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-20.04
1414
steps:
1515
- name: Dump GitHub context
1616
env:
@@ -37,7 +37,7 @@ jobs:
3737
MATRIX_CONTEXT: ${{ toJSON(matrix) }}
3838
run: echo "$MATRIX_CONTEXT"
3939
version:
40-
runs-on: ubuntu-latest
40+
runs-on: ubuntu-20.04
4141
outputs:
4242
new_version: ${{ steps.output.outputs.new_version }}
4343
steps:
@@ -81,8 +81,6 @@ jobs:
8181
restore-keys: ${{ runner.os }}-m2
8282
- name: Install native-image module
8383
run: gu install native-image
84-
- name: Install upx
85-
run: brew install upx
8684
- name: Build with Maven
8785
run: |
8886
set -o xtrace
@@ -94,8 +92,6 @@ jobs:
9492
- name: Test and compress executable
9593
run: |
9694
"./target/${{ env.ARTIFACT }}-macos-${REVISION}"
97-
upx "target/${{ env.ARTIFACT }}-macos-${REVISION}"
98-
"./target/${{ env.ARTIFACT }}-macos-${REVISION}"
9995
- name: Move artifacts
10096
run: |
10197
mkdir target/artifacts
@@ -105,7 +101,7 @@ jobs:
105101
name: ${{ env.ARTIFACT }}-${{ github.job }}-${{ needs.version.outputs.new_version }}
106102
path: target/artifacts
107103
linux:
108-
runs-on: ubuntu-latest
104+
runs-on: ubuntu-20.04
109105
needs: version
110106
env:
111107
REVISION: ${{ needs.version.outputs.new_version }}
@@ -128,10 +124,6 @@ jobs:
128124
restore-keys: ${{ runner.os }}-m2
129125
- name: Install native-image module
130126
run: gu install native-image
131-
- name: Install upx
132-
run: |
133-
wget -q https://github.com/upx/upx/releases/download/v3.96/upx-3.96-amd64_linux.tar.xz
134-
tar xf upx-3.96-amd64_linux.tar.xz
135127
- name: Build with Maven
136128
run: |
137129
set -o xtrace
@@ -143,8 +135,6 @@ jobs:
143135
- name: Test and compress executable
144136
run: |
145137
"./target/${{ env.ARTIFACT }}-linux-${REVISION}"
146-
./upx-3.96-amd64_linux/upx "target/${{ env.ARTIFACT }}-linux-${REVISION}"
147-
"./target/${{ env.ARTIFACT }}-linux-${REVISION}"
148138
- name: Move artifacts
149139
run: |
150140
mkdir target/artifacts
@@ -171,8 +161,6 @@ jobs:
171161
java: 'java11'
172162
- name: Install native-image module
173163
run: '& "$env:JAVA_HOME\bin\gu" install native-image'
174-
- name: Install upx
175-
run: choco install upx --version=3.96 --no-progress
176164
- name: Set up Visual Studio shell
177165
uses: egor-tensin/vs-shell@v2
178166
- name: Cache Maven packages
@@ -188,18 +176,11 @@ jobs:
188176
run: |
189177
$expectedOutput = "You are missing some arguments!`r`nType in --help or -h for help.`r`n"
190178
$firstOutput = & "./target/${{ env.ARTIFACT }}-windows-$env:REVISION.exe" | Out-String
191-
upx "target/${{ env.ARTIFACT }}-windows-$env:REVISION.exe"
192-
$secondOutput = & "./target/${{ env.ARTIFACT }}-windows-$env:REVISION.exe" | Out-String
193179
if ($firstOutput -ne $expectedOutput) {
194180
echo "The first output is wrong:"
195181
echo $firstOutput
196182
exit 1
197183
}
198-
if ($secondOutput -ne $expectedOutput) {
199-
echo "The second output is wrong:"
200-
echo $secondOutput
201-
exit 1
202-
}
203184
- name: Move artifacts
204185
run: |
205186
mkdir target/artifacts
@@ -210,7 +191,7 @@ jobs:
210191
path: target/artifacts
211192
release:
212193
if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }}
213-
runs-on: ubuntu-latest
194+
runs-on: ubuntu-20.04
214195
needs: [version, macos, linux, windows]
215196
steps:
216197
- uses: actions/checkout@v3
@@ -296,7 +277,7 @@ jobs:
296277
deploy:
297278
needs: [version, macos, linux, windows]
298279
if: ${{ github.event_name == 'push' && !startsWith(github.ref, 'refs/heads/dependabot/') }}
299-
runs-on: ubuntu-latest
280+
runs-on: ubuntu-20.04
300281
steps:
301282
- uses: actions/checkout@v3
302283
- uses: actions/setup-java@v3

mvnw

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/sh
22
# ----------------------------------------------------------------------------
33
# Licensed to the Apache Software Foundation (ASF) under one
44
# or more contributor license agreements. See the NOTICE file

0 commit comments

Comments
 (0)