Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions .github/workflows/asset_dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,26 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: nelonoel/branch-name@v1.0.1
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true # Runs bundle install and caches gems. See the ruby_test.yml
# example if you need more control over bundler.
bundler-cache: true # runs 'bundle install' and caches installed gems automatically

# Create a release tag based on the branch name and .release-version file
- name: Set release tag
# https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
# On the develop branch this might create RELEASE_VERSION=2.4.6-987654321-develop
# On the master branch this would then only create RELEASE_VERSION=2.4.6
run: echo "RELEASE_VERSION=$(printf -- '%s%s\n' $(cat .release-version) $([ ${BRANCH_NAME} = "develop" ] && printf -- '-%s-develop' ${GITHUB_RUN_ID} || echo ""))" >> $GITHUB_ENV

- name: Set up environment
run: |
cp config/database.yml.example config/database.yml
cp config/bunny.yml.example config/bunny.yml

- name: Compile Build
run: ./compile-build
- name: Create Build
run: ./compile-build '' v${{ env.RELEASE_VERSION }} ${BRANCH_NAME}

- name: Create release
uses: ncipollo/release-action@v1.8.8
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/automated_release_and_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,18 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true # Runs bundle install and caches gems. See the ruby_test.yml
# example if you need more control over bundler.
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
- name: Export node version
id: node_version
run: echo ::set-output name=NODE_VERSION::$(cat .nvmrc)
- name: Setup node
uses: actions/setup-node@v2
with:
node-version: ${{ steps.node_version.outputs.NODE_VERSION }}

# Create a release tag based on the branch name and .release-version file
- name: Set release tag
# https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
# On the develop branch this might create RELEASE_VERSION=2.4.6-987654321-develop
# On the master branch this would then only create RELEASE_VERSION=2.4.6
run: echo "RELEASE_VERSION=$(printf -- '%s%s\n' $(cat .release-version) $([ ${BRANCH_NAME} = "develop" ] && printf -- '-%s-develop' ${GITHUB_RUN_ID} || echo ""))" >> $GITHUB_ENV
Expand All @@ -34,8 +36,8 @@ jobs:
cp config/database.yml.example config/database.yml
cp config/bunny.yml.example config/bunny.yml

- name: Compile Build
run: ./compile-build
- name: Create Build
run: ./compile-build '' v${{ env.RELEASE_VERSION }} ${BRANCH_NAME}

- name: Create release and upload release.tar.gz
uses: ncipollo/release-action@v1.8.8
Expand Down
2 changes: 1 addition & 1 deletion app/views/about/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="about">
<div>
<p>Version 1.0</p>
<p><%= Deployed::VERSION_STRING %></p>
</div>
<div>
<p><a href="https://sanger.freshservice.com/support/catalog/items?category_id=53000051282" target="_blank">Report an issue</a></p>
Expand Down
6 changes: 3 additions & 3 deletions compile-build
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ bundle exec rake assets:clobber
echo 'Compiling assets'
bundle exec rake assets:precompile
echo 'Generating sha'
git rev-parse HEAD > REVISION
git tag -l --points-at HEAD --sort -version:refname | head -1 > TAG
git rev-parse --abbrev-ref HEAD > BRANCH
echo ${1:-$(git rev-parse HEAD)} > REVISION
echo ${2:-$(git tag -l --points-at HEAD --sort -version:refname | head -1)} > TAG
echo ${3:-$(git rev-parse --abbrev-ref HEAD)} > BRANCH
echo 'Compiling tar.gz'
tar \
--exclude='*.swp' \
Expand Down
Binary file modified public/favicon.ico
Binary file not shown.
Loading