Skip to content

Commit

Permalink
Final cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexRuiz7 committed Dec 22, 2023
1 parent 95bdb82 commit d125e74
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 21 deletions.
11 changes: 1 addition & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,13 @@ on:
# | https://docs.github.com/en/actions/using-workflows/reusing-workflows#limitations
# * Using matrix in reusable workflows:
# | https://docs.github.com/en/actions/using-workflows/reusing-workflows#using-a-matrix-strategy-with-a-reusable-workflow
# * Reading input from the called workflow
# * Reading input from the called workflow
# | https://docs.github.com/en/enterprise-cloud@latest/actions/using-workflows/workflow-syntax-for-github-actions#onworkflow_callinputs

env:
ACT: # Used to run locally using https://github.com/nektos/act
# VERSION: # Stored in ${{ version.outputs.version }}
# rpm_x64:
# deb_x64:
# echo "{${{ matrix.distribution }}_${{ matrix.distribution }}}={value}" >> "$GITHUB_ENV"

jobs:
version:
uses: ./.github/workflows/r_version.yml

# idea: test if the the code and repo versions match (vars.VERSION), if not
# raise an error to cancel build
build:
needs: version
strategy:
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/r_assemble.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,13 @@ on:

jobs:
r_assemble:
# runs-on: ${{ inputs.architecture }}
runs-on: ubuntu-latest
# Permissions to upload the package
permissions:
packages: write
contents: read
steps:
- uses: actions/checkout@v4
- name: Test
run: |
echo "${{ inputs.distribution }}_${{ inputs.architecture }}"
echo ${{ inputs.name }}
- name: Download artifact
uses: actions/download-artifact@v4
with:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/r_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@ on:
type: string
outputs:
package:
description: "The package's name"
description: "The name of the generated package."
value: ${{ jobs.r_build.outputs.package }}

jobs:
r_build:
# runs-on: ${{ inputs.architecture }}
runs-on: ubuntu-latest
# Permissions to upload the package
permissions:
Expand All @@ -38,7 +37,6 @@ jobs:
with:
distribution: temurin
java-version: 11
cache: 'gradle'

- name: Setup Gradle
uses: gradle/[email protected]
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/r_version.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build (reusable)
name: Version (reusable)

# This workflow runs when any of the following occur:
# - Run from another workflow
Expand All @@ -16,7 +16,6 @@ jobs:
version: ${{ steps.get_version.outputs.version }}
steps:
- uses: actions/checkout@v4

- name: Read 'VERSION'
id: get_version
run: |
Expand Down

0 comments on commit d125e74

Please sign in to comment.