Merge remote-tracking branch 'upstream/main' into user-dist_prefs

bmad-sim · Sep 21, 2023 · 855bb90 · 855bb90
2 parents 050d40f + ce23a35
commit 855bb90
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -58,6 +58,7 @@ jobs:
 
  - name: Extract dependencies
  run: |
+ echo "GITHUB_WORKSPACE: $GITHUB_WORKSPACE"
  for dep in ~/external_deps/*.tar.gz; \
  do \
  tar xzvf $dep -C $GITHUB_WORKSPACE/; \
@@ -66,7 +67,9 @@ jobs:
  - name: Assemble Tarball
  run: |
  mkdir -p ~/bmad_dist;
- tar -cjf ~/bmad_dist/bmad_dist.tar.gz -C $GITHUB_WORKSPACE .
+ mkdir ~/bmad_dist_${{ steps.release_name.outputs.version }};
+ cp -r $GITHUB_WORKSPACE ~/bmad_dist_${{ steps.release_name.outputs.version }}/;
+ tar -czf ~/bmad_dist/bmad_dist.tar.gz -C ~/ bmad_dist_${{ steps.release_name.outputs.version }}
 
 
  - name: Create Release - ${{ steps.release_name.outputs.version }}
@@ -106,4 +109,4 @@ jobs:
  message_format: ':tada: *{workflow}* produced a new release of Bmad (${{ steps.release_name.outputs.version }}). Check it out at <${{ steps.create_release.outputs.html_url }}|{repo}>.'
  footer: ''
  env:
- SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+ SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}