Skip to content

Commit

Permalink
Merge branch 'main' into 61-image-fft-with-3d-projection
Browse files Browse the repository at this point in the history
  • Loading branch information
samypr100 authored Jun 8, 2024
2 parents 30bbd39 + d2cdfd6 commit d357fda
Show file tree
Hide file tree
Showing 6 changed files with 158 additions and 136 deletions.
1 change: 1 addition & 0 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
release:
types:
- published
workflow_dispatch:

permissions:
contents: write
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
release:
types:
- published
workflow_dispatch:

permissions:
contents: write
Expand Down Expand Up @@ -56,7 +57,7 @@ jobs:
${{ runner.os }}-${{ runner.arch }}-maven-
- name: Maven Build Jar
run: mvn -V -B -e -ff -ntp clean package -Passembly
run: ./mvnw -V -B -e -ff -ntp clean package -Passembly

- name: Upload Jar
uses: actions/upload-artifact@v4
Expand All @@ -82,7 +83,6 @@ jobs:
- macos-14 # ARM64 OSX
#- macos-13 # Intel OSX (TODO Not Supported)


steps:

- uses: actions/checkout@v4
Expand Down Expand Up @@ -118,12 +118,6 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}
native-image-job-reports: 'true'

# Specific Version Required by Gluon Plugin
- name: Set Up Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.8.8

- name: Cache Maven repository
uses: actions/cache@v4
with:
Expand All @@ -133,7 +127,7 @@ jobs:
${{ runner.os }}-${{ runner.arch }}-maven-
- name: Maven Build Graal VM
run: mvn -V -B -e -ff -ntp clean gluonfx:compile gluonfx:link
run: ./mvnw -V -B -e -ff -ntp clean gluonfx:compile gluonfx:link

- name: Upload Native
uses: actions/upload-artifact@v4
Expand Down
Binary file added .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.2
distributionType=bin
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
Loading

0 comments on commit d357fda

Please sign in to comment.