Skip to content

Commit

Permalink
Revert all changes except ubuntu-22.04
Browse files Browse the repository at this point in the history
  • Loading branch information
thomas-bc authored Oct 15, 2024
1 parent 1407109 commit da3b681
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v4
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/native-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
name: "Build Standard JARs"
steps:
- name: "Checkout repository"
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
submodules: recursive
- name: "Setup Native Image Tools"
Expand All @@ -64,7 +64,7 @@ jobs:
${{ inputs.build }} ${{ inputs.output-directory }}
shell: bash
- name: "Archiving JARs package"
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: build-jar
path: ${{ inputs.output-directory }}/*
Expand All @@ -80,7 +80,7 @@ jobs:
${{ inputs.test }}
echo -e "Trace output files:\n$( find ${{ inputs.trace-directory }} -name *.json )"
- name: "Archiving Tracing"
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: jar-traces
path: ${{ inputs.trace-directory }}/*.json
Expand Down Expand Up @@ -182,11 +182,11 @@ jobs:
matrix: ${{ fromJson(needs.generate-run-matricies.outputs.tags) }}
steps:
- name: "Checkout repository"
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
submodules: recursive
- name: "Download Package"
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: build-${{ matrix.tag }}
path: ${{ inputs.output-directory }}
Expand All @@ -208,7 +208,7 @@ jobs:
fprime-native-packager ${{ inputs.output-directory }} ${FLAGS}
shell: bash
- name: "Archiving Wheels"
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: wheels-${{ matrix.tag }}
path: packages/dist/*
Expand All @@ -223,12 +223,12 @@ jobs:
- name: "Setup Native Image Tools"
uses: fprime-community/native-images-action@main
- name: "Download Native Wheels"
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: wheels-${{ matrix.run.tag }}
path: ${{ inputs.output-directory }}/native
- name: "Download JAR Wheels"
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: wheels-jar
path: ${{ inputs.output-directory }}/jars
Expand All @@ -250,7 +250,7 @@ jobs:
matrix: ${{ fromJson(needs.generate-run-matricies.outputs.tags) }}
steps:
- name: "Download Package"
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: wheels-${{ matrix.tag }}
path: dist
Expand Down

0 comments on commit da3b681

Please sign in to comment.