@@ -36,49 +36,19 @@ run-name: "Release: Build Sign Upload [${{ github.ref_name }}]"
3636# SIGNING_KEY_WINDOWS_PASSPHRASE
3737# SIGNING_KEY_WINDOWS_PFX
3838
39-
4039on :
4140 workflow_dispatch :
4241
4342permissions :
4443 contents : read
4544
4645defaults :
47- # top-level defaults subkeys apply to jobs
48- # run subkeys apply to all steps within all jobs
4946 run :
5047 shell : bash
5148
5249jobs :
53-
54- # test:
55- # environment: DEV
56- # runs-on: ubuntu-latest
57- # steps:
58- # - name: Setup upterm session
59- # env:
60- # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
61- # AWS_REGION: ${{ secrets.AWS_REGION }}
62- # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
63- # GIT_RELEASE_TARGET_REPO: ${{ secrets.GIT_RELEASE_TARGET_REPO }}
64- # GIT_REPO_ACCESS_TOKEN: ${{ secrets.GIT_REPO_ACCESS_TOKEN }}
65- # SIGNING_KEY_GPG: ${{ secrets.SIGNING_KEY_GPG }}
66- # SIGNING_KEY_GPG_ID: ${{ secrets.SIGNING_KEY_GPG_ID }}
67- # SIGNING_KEY_GPG_PASSPHRASE: ${{ secrets.SIGNING_KEY_GPG_PASSPHRASE }}
68- # SIGNING_KEY_MAC_ID: ${{ secrets.SIGNING_KEY_MAC_ID }}
69- # SIGNING_KEY_MAC_PASSPHRASE: ${{ secrets.SIGNING_KEY_MAC_PASSPHRASE }}
70- # SIGNING_KEY_MAC_PFX: ${{ secrets.SIGNING_KEY_MAC_PFX }}
71- # SIGNING_KEY_WINDOWS_ID: ${{ secrets.SIGNING_KEY_WINDOWS_ID }}
72- # SIGNING_KEY_WINDOWS_PASSPHRASE: ${{ secrets.SIGNING_KEY_WINDOWS_PASSPHRASE }}
73- # SIGNING_KEY_WINDOWS_PFX: ${{ secrets.SIGNING_KEY_WINDOWS_PFX }}
74- # SIGNING_TEST_CA_MAC: ${{ secrets.SIGNING_TEST_CA_MAC }}
75- # if: always()
76- # uses: lhotari/action-upterm@v1
77- # timeout-minutes: 60
78-
7950 setup :
8051 name : Setup
81- # needs: test
8252 runs-on : ubuntu-latest
8353
8454 outputs :
@@ -673,24 +643,6 @@ jobs:
673643 smctl windows certsync
674644 shell : cmd
675645
676- # This is for debugging windows
677- # - name: enable ssh
678- # if: always()
679- # run: |
680- # Get-WindowsCapability -Online
681- # $componentName = $(Get-WindowsCapability -Online |Where-Object Name -like 'OpenSSH.Server*').Name
682- # Add-WindowsCapability -Online -Name $componentName
683- # Get-NetFirewallRule -Name "OpenSSH-Server-In-TCP"
684-
685- # - name: ssh session
686- # if: always()
687- # run: |
688- # Start-Service sshd
689- # echo "IP address below:"
690- # Get-NetIPAddress | Select-Object -Property IPAddress
691- # sleep 3600
692- # Stop-Service sshd
693-
694646 - name : Sign Windows binaries
695647 run : |
696648 smctl healthcheck --all
@@ -754,9 +706,6 @@ jobs:
754706 popd
755707 Get-ChildItem "${env:RUNNER_TEMP}"
756708
757- # - name: Setup tmate session
758- # uses: mxschmitt/action-tmate@v3
759-
760709 - name : Save installer and dist files as a GitHub Action Artifact
761710 uses : actions/upload-artifact@v4
762711 with :
@@ -1009,51 +958,53 @@ jobs:
1009958 github-release-draft :
1010959 name : Create GitHub Release Draft
1011960 runs-on : ubuntu-latest
961+ env :
962+ REPO_DIR : repo
963+ ARTIFACTS_DIR : artifacts
1012964 permissions :
1013965 actions : read
1014966 contents : write
1015967 needs :
1016968 - setup
1017- - test-rpm-package
1018- - test-deb-package
1019- - test-macos
1020- - test-windows
969+ - s3-upload
1021970 steps :
1022971 - name : Download signed artifacts
1023972 uses : actions/download-artifact@v4
1024973 with :
1025974 name : final-artifacts
1026- path : artifacts # download all artifacts to 'artifacts/'
975+ path : ${{ env.ARTIFACTS_DIR }}
1027976
1028977 - name : Checkout CLI
1029978 uses : actions/checkout@v4
1030-
979+ with :
980+ path : ${{ env.REPO_DIR }}
981+
1031982 - name : Prepare release notes
1032983 run : |
1033- sed -i 's/new-version/${{ needs.setup.outputs.version-build }}/g' . github/release/release-notes-template.txt
984+ sed -i 's/new-version/${{ needs.setup.outputs.version-build }}/g' "${{ env.REPO_DIR }}/. github/release/release-notes-template.txt"
1034985
1035986 - name : Create draft release
1036987 uses : softprops/action-gh-release@v2
1037988 with :
1038989 draft : true
1039990 name : " DRAFT v${{ needs.setup.outputs.version-build }}"
1040991 tag_name : " v${{ needs.setup.outputs.version-build }}"
1041- body_path : " .github/release/release-notes-template.txt"
992+ body_path : " ${{ env.REPO_DIR }}/ .github/release/release-notes-template.txt"
1042993 fail_on_unmatched_files : true
1043994 generate_release_notes : true
1044995 files : |
1045- artifacts /cf-cli-linux-rpm-packages/cf*rpm
1046- artifacts /cf-cli-linux-deb-packages/cf*deb
1047- artifacts /cf-cli-macos-packages/cf*pkg
1048- artifacts /cf-cli-windows-packages/cf*zip
1049- artifacts /linux_i686/*tgz
1050- artifacts /linux_x86-64/*tgz
1051- artifacts /linux_arm64/*tgz
1052- artifacts /osx/*tgz
1053- artifacts /macosarm/*tgz
1054- artifacts /win32/*zip
1055- artifacts /winx64/*zip
1056-
996+ ${{ env.ARTIFACTS_DIR }} /cf-cli-linux-rpm-packages/cf*rpm
997+ ${{ env.ARTIFACTS_DIR }} /cf-cli-linux-deb-packages/cf*deb
998+ ${{ env.ARTIFACTS_DIR }} /cf-cli-macos-packages/cf*pkg
999+ ${{ env.ARTIFACTS_DIR }} /cf-cli-windows-packages/cf*zip
1000+ ${{ env.ARTIFACTS_DIR }} /linux_i686/*tgz
1001+ ${{ env.ARTIFACTS_DIR }} /linux_x86-64/*tgz
1002+ ${{ env.ARTIFACTS_DIR }} /linux_arm64/*tgz
1003+ ${{ env.ARTIFACTS_DIR }} /osx/*tgz
1004+ ${{ env.ARTIFACTS_DIR }} /macosarm/*tgz
1005+ ${{ env.ARTIFACTS_DIR }} /win32/*zip
1006+ ${{ env.ARTIFACTS_DIR }} /winx64/*zip
1007+
10571008 update-claw :
10581009 name : Add new release version to CLAW
10591010 runs-on : ubuntu-latest
@@ -1094,5 +1045,4 @@ jobs:
10941045
10951046 git push
10961047 fi
1097- popd
1098- # vim: set sw=2 ts=2 sts=2 et tw=78 foldlevel=2 fdm=indent nospell:
1048+ popd
0 commit comments