Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
pschicho committed Oct 23, 2024
2 parents a04e2b9 + b5c63b2 commit d64d9cd
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 16 deletions.
45 changes: 43 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: Build and release
on:
push:
tags:
- "v*"
- "v*.*.*"
workflow_dispatch:

jobs:
Expand All @@ -16,6 +16,47 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2

- name: Get the latest tag and date
id: version_info
run: |
echo "tag=$(echo $GITHUB_REF | sed 's/refs\/tags\///')" >> $GITHUB_ENV
echo "date=$(date +"(%d-%m-%Y)")" >> $GITHUB_ENV
- name: Check if WallGoMatrixVersion matches GitHub tag
run: |
WallGoMatrixVersion=$(sed -n 's/WallGoMatrix`\$WallGoMatrixVersion = "\(.*\)";/\1/p' WallGoMatrix.m)
WallGoMatrixVersionDate=$(sed -n 's/WallGoMatrix`\$WallGoMatrixVersionDate = "\(.*\)";/\1/p' WallGoMatrix.m)
if [ "$WallGoMatrixVersion" == "${{ env.tag }}" ]; then
echo "WallGoMatrixVersion matches the tag"
else
echo "Error: WallGoMatrixVersion ($WallGoMatrixVersion) does not match tag (${{ env.tag }})" 1>&2
exit 64
fi
if [ "$WallGoMatrixVersionDate" == "${{ env.date }}" ]; then
echo "WallGoMatrixVersionDate matches the date"
else
echo "Error: WallGoMatrix date $WallGoMatrixVersionDate does not match date ${{ env.date }}" 1>&2
exit 64
fi
# - name: Update version and date in WallGoMatrix.m
# run: |
# sed -i.bak \
# -e "s/WallGoMatrix\`\$WallGoMatrixVersion = \".*\";/WallGoMatrix\`\$WallGoMatrixVersion = \"${{ env.tag }}\"\;/" \
# -e "s/WallGoMatrix\`\$WallGoMatrixVersionDate = \".*\"\;/WallGoMatrix\`\$WallGoMatrixVersionDate = \"${{ env.date }}\"\;/" \
# WallGoMatrix.m

# - name: Commit and push version update
# run: |
# git config --global user.name 'github-actions'
# git config --global user.email '[email protected]'
# rm WallGoMatrix.m.bak
# git add WallGoMatrix.m
# git commit -m "Update WallGoMatrix version to ${{ env.tag }} and date to ${{ env.date }}"
# git push origin HEAD

- name: Create Release
id: create_release
uses: actions/create-release@v1
Expand Down Expand Up @@ -46,4 +87,4 @@ jobs:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./WallGoMatrix_${{ github.ref_name }}.zip
asset_name: WallGoMatrix_${{ github.ref_name }}.zip
asset_content_type: application/zip
asset_content_type: application/zip
21 changes: 11 additions & 10 deletions WallGoMatrix.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,22 @@

(* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ *)

(* :Title: WallGoMatrix *)
(* :Title: WallGoMatrix *)

(*
This software is covered by the GNU General Public License 3.
Copyright (C) 2024-2024 Andreas Ekstedt
Copyright (C) 2024-2024 Oliver Gould
Copyright (C) 2024-2024 Joonas Hirvonen
Copyright (C) 2024-2024 Benoit Laurent
Copyright (C) 2024-2024 Lauri Niemi
Copyright (C) 2024-2024 Philipp Schicho
Copyright (C) 2024-2024 Jorinde van de Vis
This software is covered by the GNU General Public License 3.
Copyright (C) 2024-2024 Andreas Ekstedt
Copyright (C) 2024-2024 Oliver Gould
Copyright (C) 2024-2024 Joonas Hirvonen
Copyright (C) 2024-2024 Benoit Laurent
Copyright (C) 2024-2024 Lauri Niemi
Copyright (C) 2024-2024 Philipp Schicho
Copyright (C) 2024-2024 Jorinde van de Vis
*)

(* :Summary: WallgoMatirx is an algorithm that constructs
the Matrix Elements at Leading Log and partially NLL for generic models. *)
the Matrix Elements at Leading Log and partially NLL for generic models.
*)

(* ------------------------------------------------------------------------ *)

Expand Down
4 changes: 0 additions & 4 deletions examples/qcd.m
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,3 @@
ParticleName,
ParticleMasses,
{TruncateAtLeadingLog->True,Format->{"json","txt"}}];




0 comments on commit d64d9cd

Please sign in to comment.