Skip to content

chore: Remove -amd64 suffix from MSI #3169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrsillydog merged 1 commit into from
Feb 23, 2026
Merged

chore: Remove -amd64 suffix from MSI #3169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .github/workflows/manual_msi_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
unzip wix314-binaries.zip
working-directory: C:/build
- name: Build AMD64 MSI
run: go-msi.exe make -m observiq-otel-collector-amd64.msi --version ${{ github.event.inputs.version }} --arch x64
run: go-msi.exe make -m observiq-otel-collector.msi --version ${{ github.event.inputs.version }} --arch x64
working-directory: C:/build
- name: Copy ARM64 Binaries to Build Dir
run: |
Expand All @@ -75,7 +75,7 @@ jobs:
shell: bash
- name: Sign AMD64 MSI
run: |
smctl sign --keypair-alias ${{ secrets.BDOT_DIGICERT_KEYPAIR_ALIAS }} --input C:/build/observiq-otel-collector-amd64.msi --config-file C:\Users\RUNNER~1\AppData\Local\Temp\smtools-windows-x64\pkcs11properties.cfg
smctl sign --keypair-alias ${{ secrets.BDOT_DIGICERT_KEYPAIR_ALIAS }} --input C:/build/observiq-otel-collector.msi --config-file C:\Users\RUNNER~1\AppData\Local\Temp\smtools-windows-x64\pkcs11properties.cfg
shell: cmd
- name: Sign ARM64 MSI
run: |
Expand All @@ -84,8 +84,8 @@ jobs:
- name: "Upload AMD64 MSI"
uses: actions/upload-artifact@v4
with:
name: observiq-otel-collector-amd64.msi
path: C:/build/observiq-otel-collector-amd64.msi
name: observiq-otel-collector.msi
path: C:/build/observiq-otel-collector.msi
# Short lived because this is meant as an action for developers
retention-days: 1
- name: "Upload ARM64 MSI"
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
unzip wix314-binaries.zip
working-directory: C:/build
- name: Build AMD64 MSI
run: go-msi.exe make -m observiq-otel-collector-amd64.msi --version ${{ github.event.inputs.version }} --arch x64
run: go-msi.exe make -m observiq-otel-collector.msi --version ${{ github.event.inputs.version }} --arch x64
working-directory: C:/build
- name: Copy ARM64 Binaries to Build Dir
run: |
Expand All @@ -75,7 +75,7 @@ jobs:
shell: bash
- name: Sign AMD64 MSI
run: |
smctl sign --keypair-alias ${{ secrets.BDOT_DIGICERT_KEYPAIR_ALIAS }} --input C:/build/observiq-otel-collector-amd64.msi --config-file C:\Users\RUNNER~1\AppData\Local\Temp\smtools-windows-x64\pkcs11properties.cfg
smctl sign --keypair-alias ${{ secrets.BDOT_DIGICERT_KEYPAIR_ALIAS }} --input C:/build/observiq-otel-collector.msi --config-file C:\Users\RUNNER~1\AppData\Local\Temp\smtools-windows-x64\pkcs11properties.cfg
shell: cmd
- name: Sign ARM64 MSI
run: |
Expand All @@ -84,8 +84,8 @@ jobs:
- name: "Upload AMD64 MSI"
uses: actions/upload-artifact@v4
with:
name: observiq-otel-collector-amd64.msi
path: C:/build/observiq-otel-collector-amd64.msi
name: observiq-otel-collector.msi
path: C:/build/observiq-otel-collector.msi
retention-days: 1
- name: "Upload ARM64 MSI"
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
- name: Retrieve Windows AMD64 MSI Installer
uses: actions/download-artifact@v4
with:
name: observiq-otel-collector-amd64.msi
name: observiq-otel-collector.msi

- name: Retrieve Windows ARM64 MSI Installer
uses: actions/download-artifact@v4
Expand All @@ -139,7 +139,7 @@ jobs:
COSIGN_PRIVATE_KEY: ${{secrets.ORG_COSIGN_PRIVATE_KEY}}

- name: Sign AMD64 MSI
run: cosign sign-blob --key=cosign.key --output-signature ./observiq-otel-collector-amd64.msi.sig ./observiq-otel-collector-amd64.msi
run: cosign sign-blob --key=cosign.key --output-signature ./observiq-otel-collector.msi.sig ./observiq-otel-collector.msi
shell: bash
env:
COSIGN_PASSWORD: ${{ secrets.ORG_COSIGN_PWD }}
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
mkdir artifacts
cp ./scripts/install/*.sh ./artifacts
cp ./release_deps/gpg-keys.tar.gz ./artifacts/gpg-keys.tar.gz
cp ./observiq-otel-collector-amd64.msi ./artifacts
cp ./observiq-otel-collector.msi ./artifacts
cp ./observiq-otel-collector-arm64.msi ./artifacts
cp ./dist/*tar.gz ./artifacts
cp ./dist/*.zip ./artifacts
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
unzip wix314-binaries.zip
working-directory: C:/build
- name: Build AMD64 MSI
run: go-msi.exe make -m observiq-otel-collector-amd64.msi --version ${{ github.ref_name }} --arch x64
run: go-msi.exe make -m observiq-otel-collector.msi --version ${{ github.ref_name }} --arch x64
working-directory: C:/build
- name: Copy ARM64 Binaries to Build Dir
run: |
Expand All @@ -73,7 +73,7 @@ jobs:
shell: bash
- name: Sign AMD64 MSI
run: |
smctl sign --keypair-alias ${{ secrets.BDOT_DIGICERT_KEYPAIR_ALIAS }} --input C:/build/observiq-otel-collector-amd64.msi --config-file C:\Users\RUNNER~1\AppData\Local\Temp\smtools-windows-x64\pkcs11properties.cfg
smctl sign --keypair-alias ${{ secrets.BDOT_DIGICERT_KEYPAIR_ALIAS }} --input C:/build/observiq-otel-collector.msi --config-file C:\Users\RUNNER~1\AppData\Local\Temp\smtools-windows-x64\pkcs11properties.cfg
shell: cmd
- name: Sign ARM64 MSI
run: |
Expand All @@ -82,8 +82,8 @@ jobs:
- name: "Upload AMD64 MSI"
uses: actions/upload-artifact@v4
with:
name: observiq-otel-collector-amd64.msi
path: C:/build/observiq-otel-collector-amd64.msi
name: observiq-otel-collector.msi
path: C:/build/observiq-otel-collector.msi
# Short lived because Go Releaser will upload the msi to a release (github release, gcs, etc)
retention-days: 1
- name: "Upload ARM64 MSI"
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
- name: Retrieve Windows AMD64 MSI Installer
uses: actions/download-artifact@v4
with:
name: observiq-otel-collector-amd64.msi
name: observiq-otel-collector.msi
- name: Retrieve Windows ARM64 MSI Installer
uses: actions/download-artifact@v4
with:
Expand All @@ -166,7 +166,7 @@ jobs:
with:
path: ~/.cache/goreleaser
- name: Sign AMD64 MSI
run: cosign sign-blob --key=cosign.key --output-signature ./observiq-otel-collector-amd64.msi.sig ./observiq-otel-collector-amd64.msi
run: cosign sign-blob --key=cosign.key --output-signature ./observiq-otel-collector.msi.sig ./observiq-otel-collector.msi
shell: bash
env:
COSIGN_PASSWORD: ${{ secrets.ORG_COSIGN_PWD }}
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
mkdir artifacts
cp ./scripts/install/*.sh ./artifacts
cp ./release_deps/gpg-keys.tar.gz ./artifacts/gpg-keys.tar.gz
cp ./observiq-otel-collector-amd64.msi ./artifacts
cp ./observiq-otel-collector.msi ./artifacts
cp ./observiq-otel-collector-arm64.msi ./artifacts
cp ./dist/*tar.gz ./artifacts
cp ./dist/*.zip ./artifacts
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ release-prep-gpg:
.PHONY: release-test
release-test:
# If there are no MSIs in the root dir, we'll create dummy ones so that goreleaser can complete successfully
if [ ! -e "./observiq-otel-collector-amd64.msi" ]; then touch ./observiq-otel-collector-amd64.msi; fi
if [ ! -e "./observiq-otel-collector.msi" ]; then touch ./observiq-otel-collector.msi; fi
if [ ! -e "./observiq-otel-collector-arm64.msi" ]; then touch ./observiq-otel-collector-arm64.msi; fi
SIGNING_KEY_FILE="fake-file" GORELEASER_CURRENT_TAG=$(VERSION) goreleaser release --parallelism 4 --skip=publish --skip=validate --skip=sign --clean --snapshot

Expand Down
Loading