Skip to content

Commit e809c62

Browse files
brushknightbrushknight
authored
disable macOS tar.gz upload, add brew formula support (newrelic#661)
- Disabled macOS pipeline as we are not shipping compiled binaries in favor of brew formula - Changed default agent directory for macOS to /usr/local/var/db/newrelic-infra/ - Changed default agent config for macOS to /usr/local/etc/newrelic-infra/newrelic-infra.yml - Added brew formula file build/package/darwin/newrelic-infra-agent.rb that will be later added into - https://github.com/Homebrew/homebrew-core - Using go@1.14.15 for compilation for macOS instead of go@1.14.4
1 parent 5f8d99a commit e809c62

17 files changed

+323
-249
lines changed

‎.github/workflows/prerelease_macos.yml

+62-62
Original file line numberDiff line numberDiff line change
@@ -73,65 +73,65 @@ jobs:
7373
github-token: ${{ secrets.GITHUB_TOKEN }}
7474
parallel-finished: true
7575

76-
packaging-macos:
77-
name: Build and upload all artifacts into GH Release assets
78-
runs-on: macos-11
79-
needs: [unit-test-macos]
80-
81-
steps:
82-
- uses: actions/checkout@v2
83-
84-
- name: Install Go
85-
uses: actions/setup-go@v2
86-
with:
87-
go-version: ${{env.GO_VERSION}}
88-
89-
- name: Install macos build dependencies
90-
shell: bash
91-
run: build/install_macos_dependencies.sh
92-
93-
- name: Releasing macos packages
94-
run: make ci/prerelease/macos
95-
96-
publishing-to-s3-macos:
97-
name: Publish macos artifacts into s3 staging bucket
98-
runs-on: ubuntu-20.04
99-
needs: [packaging-macos]
100-
101-
strategy:
102-
max-parallel: 1
103-
matrix:
104-
assetsType:
105-
- "targz"
106-
107-
steps:
108-
- name: Login to DockerHub
109-
uses: docker/login-action@v1
110-
with:
111-
username: ${{ env.DOCKER_HUB_ID }}
112-
password: ${{ env.DOCKER_HUB_PASSWORD }}
113-
- name: Publish ${{ matrix.assetsType }} to S3 action
114-
uses: newrelic/infrastructure-publish-action@v1.0.14
115-
env:
116-
AWS_ACCESS_KEY_ID: ${{ secrets.OHAI_AWS_ACCESS_KEY_ID_STAGING }}
117-
AWS_SECRET_ACCESS_KEY: ${{ secrets.OHAI_AWS_SECRET_ACCESS_KEY_STAGING }}
118-
AWS_ROLE_ARN: ${{ secrets.OHAI_AWS_ROLE_ARN_STAGING }}
119-
AWS_ROLE_SESSION_NAME: ${{ secrets.OHAI_AWS_ROLE_SESSION_NAME_STAGING }}
120-
with:
121-
tag: ${{env.TAG}}
122-
app_name: "newrelic-infra"
123-
repo_name: "newrelic/infrastructure-agent"
124-
schema: "custom"
125-
schema_url: "https://raw.githubusercontent.com/newrelic/infrastructure-agent/${{ env.SCHEMA_BRANCH }}/build/upload-schema-macos-${{ matrix.assetsType }}.yml"
126-
aws_access_key_id: ${{ env.AWS_ACCESS_KEY_ID }}
127-
aws_secret_access_key: ${{ env.AWS_SECRET_ACCESS_KEY }}
128-
aws_s3_bucket_name: ${{ env.AWS_S3_BUCKET_NAME }}
129-
access_point_host: "staging"
130-
run_id: ${{ github.run_id }}
131-
aws_region: ${{ env.AWS_REGION }}
132-
aws_role_session_name: ${{ env.AWS_ROLE_SESSION_NAME }}
133-
aws_role_arn: ${{ env.AWS_ROLE_ARN }}
134-
# used for signing package stuff
135-
gpg_passphrase: ${{ env.GPG_PASSPHRASE }}
136-
gpg_private_key_base64: ${{ env.GPG_PRIVATE_KEY_BASE64 }}
137-
disable_lock: true
76+
# packaging-macos:
77+
# name: Build and upload all artifacts into GH Release assets
78+
# runs-on: macos-11
79+
# needs: [unit-test-macos]
80+
#
81+
# steps:
82+
# - uses: actions/checkout@v2
83+
#
84+
# - name: Install Go
85+
# uses: actions/setup-go@v2
86+
# with:
87+
# go-version: ${{env.GO_VERSION}}
88+
#
89+
# - name: Install macos build dependencies
90+
# shell: bash
91+
# run: build/install_macos_dependencies.sh
92+
#
93+
# - name: Releasing macos packages
94+
# run: make ci/prerelease/macos
95+
96+
# publishing-to-s3-macos:
97+
# name: Publish macos artifacts into s3 staging bucket
98+
# runs-on: ubuntu-20.04
99+
# needs: [packaging-macos]
100+
#
101+
# strategy:
102+
# max-parallel: 1
103+
# matrix:
104+
# assetsType:
105+
# - "targz"
106+
#
107+
# steps:
108+
# - name: Login to DockerHub
109+
# uses: docker/login-action@v1
110+
# with:
111+
# username: ${{ env.DOCKER_HUB_ID }}
112+
# password: ${{ env.DOCKER_HUB_PASSWORD }}
113+
# - name: Publish ${{ matrix.assetsType }} to S3 action
114+
# uses: newrelic/infrastructure-publish-action@v1.0.14
115+
# env:
116+
# AWS_ACCESS_KEY_ID: ${{ secrets.OHAI_AWS_ACCESS_KEY_ID_STAGING }}
117+
# AWS_SECRET_ACCESS_KEY: ${{ secrets.OHAI_AWS_SECRET_ACCESS_KEY_STAGING }}
118+
# AWS_ROLE_ARN: ${{ secrets.OHAI_AWS_ROLE_ARN_STAGING }}
119+
# AWS_ROLE_SESSION_NAME: ${{ secrets.OHAI_AWS_ROLE_SESSION_NAME_STAGING }}
120+
# with:
121+
# tag: ${{env.TAG}}
122+
# app_name: "newrelic-infra"
123+
# repo_name: "newrelic/infrastructure-agent"
124+
# schema: "custom"
125+
# schema_url: "https://raw.githubusercontent.com/newrelic/infrastructure-agent/${{ env.SCHEMA_BRANCH }}/build/upload-schema-macos-${{ matrix.assetsType }}.yml"
126+
# aws_access_key_id: ${{ env.AWS_ACCESS_KEY_ID }}
127+
# aws_secret_access_key: ${{ env.AWS_SECRET_ACCESS_KEY }}
128+
# aws_s3_bucket_name: ${{ env.AWS_S3_BUCKET_NAME }}
129+
# access_point_host: "staging"
130+
# run_id: ${{ github.run_id }}
131+
# aws_region: ${{ env.AWS_REGION }}
132+
# aws_role_session_name: ${{ env.AWS_ROLE_SESSION_NAME }}
133+
# aws_role_arn: ${{ env.AWS_ROLE_ARN }}
134+
# # used for signing package stuff
135+
# gpg_passphrase: ${{ env.GPG_PASSPHRASE }}
136+
# gpg_private_key_base64: ${{ env.GPG_PRIVATE_KEY_BASE64 }}
137+
# disable_lock: true

‎.github/workflows/prerelease_staged_publish.yml

+43-43
Original file line numberDiff line numberDiff line change
@@ -77,49 +77,49 @@ jobs:
7777
gpg_passphrase: ${{ env.GPG_PASSPHRASE }}
7878
gpg_private_key_base64: ${{ env.GPG_PRIVATE_KEY_BASE64 }}
7979

80-
publishing-to-s3-macos:
81-
name: Publish macos artifacts into s3 staging bucket
82-
runs-on: ubuntu-20.04
83-
84-
strategy:
85-
max-parallel: 1
86-
matrix:
87-
assetsType:
88-
- "targz"
89-
90-
steps:
91-
- name: Login to DockerHub
92-
if: ${{ (github.event.inputs.assetsType == 'all' || github.event.inputs.assetsType == matrix.assetsType) && (github.event.inputs.targzOS == 'all' || github.event.inputs.targzOS == matrix.targzOS) }}
93-
uses: docker/login-action@v1
94-
with:
95-
username: ${{ env.DOCKER_HUB_ID }}
96-
password: ${{ env.DOCKER_HUB_PASSWORD }}
97-
- name: Publish ${{ matrix.assetsType }} to S3 action
98-
if: ${{ (github.event.inputs.assetsType == 'all' || github.event.inputs.assetsType == matrix.assetsType) && (github.event.inputs.targzOS == 'all' || github.event.inputs.targzOS == matrix.targzOS) }}
99-
uses: newrelic/infrastructure-publish-action@v1.0.14
100-
env:
101-
AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
102-
AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
103-
AWS_ROLE_ARN: ${{ env.AWS_ROLE_ARN }}
104-
AWS_ROLE_SESSION_NAME: ${{ env.AWS_ROLE_SESSION_NAME }}
105-
with:
106-
tag: ${{env.TAG}}
107-
app_name: "newrelic-infra"
108-
repo_name: "newrelic/infrastructure-agent"
109-
schema: "custom"
110-
schema_url: "https://raw.githubusercontent.com/newrelic/infrastructure-agent/${{ env.SCHEMA_BRANCH }}/build/upload-schema-macos-${{ matrix.assetsType }}.yml"
111-
aws_access_key_id: ${{ env.AWS_ACCESS_KEY_ID }}
112-
aws_secret_access_key: ${{ env.AWS_SECRET_ACCESS_KEY }}
113-
aws_s3_bucket_name: ${{ env.AWS_S3_BUCKET_NAME }}
114-
aws_s3_lock_bucket_name: ${{ env.AWS_S3_LOCK_BUCKET_NAME }}
115-
access_point_host: "staging"
116-
run_id: ${{ github.run_id }}
117-
aws_region: ${{ env.AWS_REGION }}
118-
aws_role_session_name: ${{ env.AWS_ROLE_SESSION_NAME }}
119-
aws_role_arn: ${{ env.AWS_ROLE_ARN }}
120-
# used for signing package stuff
121-
gpg_passphrase: ${{ env.GPG_PASSPHRASE }}
122-
gpg_private_key_base64: ${{ env.GPG_PRIVATE_KEY_BASE64 }}
80+
# publishing-to-s3-macos:
81+
# name: Publish macos artifacts into s3 staging bucket
82+
# runs-on: ubuntu-20.04
83+
#
84+
# strategy:
85+
# max-parallel: 1
86+
# matrix:
87+
# assetsType:
88+
# - "targz"
89+
#
90+
# steps:
91+
# - name: Login to DockerHub
92+
# if: ${{ (github.event.inputs.assetsType == 'all' || github.event.inputs.assetsType == matrix.assetsType) && (github.event.inputs.targzOS == 'all' || github.event.inputs.targzOS == matrix.targzOS) }}
93+
# uses: docker/login-action@v1
94+
# with:
95+
# username: ${{ env.DOCKER_HUB_ID }}
96+
# password: ${{ env.DOCKER_HUB_PASSWORD }}
97+
# - name: Publish ${{ matrix.assetsType }} to S3 action
98+
# if: ${{ (github.event.inputs.assetsType == 'all' || github.event.inputs.assetsType == matrix.assetsType) && (github.event.inputs.targzOS == 'all' || github.event.inputs.targzOS == matrix.targzOS) }}
99+
# uses: newrelic/infrastructure-publish-action@v1.0.14
100+
# env:
101+
# AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
102+
# AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
103+
# AWS_ROLE_ARN: ${{ env.AWS_ROLE_ARN }}
104+
# AWS_ROLE_SESSION_NAME: ${{ env.AWS_ROLE_SESSION_NAME }}
105+
# with:
106+
# tag: ${{env.TAG}}
107+
# app_name: "newrelic-infra"
108+
# repo_name: "newrelic/infrastructure-agent"
109+
# schema: "custom"
110+
# schema_url: "https://raw.githubusercontent.com/newrelic/infrastructure-agent/${{ env.SCHEMA_BRANCH }}/build/upload-schema-macos-${{ matrix.assetsType }}.yml"
111+
# aws_access_key_id: ${{ env.AWS_ACCESS_KEY_ID }}
112+
# aws_secret_access_key: ${{ env.AWS_SECRET_ACCESS_KEY }}
113+
# aws_s3_bucket_name: ${{ env.AWS_S3_BUCKET_NAME }}
114+
# aws_s3_lock_bucket_name: ${{ env.AWS_S3_LOCK_BUCKET_NAME }}
115+
# access_point_host: "staging"
116+
# run_id: ${{ github.run_id }}
117+
# aws_region: ${{ env.AWS_REGION }}
118+
# aws_role_session_name: ${{ env.AWS_ROLE_SESSION_NAME }}
119+
# aws_role_arn: ${{ env.AWS_ROLE_ARN }}
120+
# # used for signing package stuff
121+
# gpg_passphrase: ${{ env.GPG_PASSPHRASE }}
122+
# gpg_private_key_base64: ${{ env.GPG_PRIVATE_KEY_BASE64 }}
123123

124124
publishing-to-s3-windows:
125125
name: Publish windows artifacts into s3 staging bucket

‎.github/workflows/release.yml

+37-37
Original file line numberDiff line numberDiff line change
@@ -68,43 +68,43 @@ jobs:
6868
gpg_private_key_base64: ${{ env.GPG_PRIVATE_KEY_BASE64 }}
6969
disable_lock: true
7070

71-
publishing-to-s3-macos:
72-
name: Publish macOS artifacts into s3 prod bucket
73-
runs-on: ubuntu-20.04
74-
75-
strategy:
76-
max-parallel: 1
77-
matrix:
78-
assetsType:
79-
- "targz"
80-
81-
steps:
82-
- name: Publish ${{ matrix.assetsType }} to S3 action
83-
uses: newrelic/infrastructure-publish-action@v1.0.14
84-
env:
85-
AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
86-
AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
87-
AWS_ROLE_ARN: ${{ env.AWS_ROLE_ARN }}
88-
AWS_ROLE_SESSION_NAME: ${{ env.AWS_ROLE_SESSION_NAME }}
89-
with:
90-
tag: ${{env.TAG}}
91-
app_name: "newrelic-infra"
92-
repo_name: "newrelic/infrastructure-agent"
93-
schema: "custom"
94-
schema_url: "https://raw.githubusercontent.com/newrelic/infrastructure-agent/${{ env.SCHEMA_BRANCH }}/build/upload-schema-macos-${{ matrix.assetsType }}.yml"
95-
aws_access_key_id: ${{ env.AWS_ACCESS_KEY_ID }}
96-
aws_secret_access_key: ${{ env.AWS_SECRET_ACCESS_KEY }}
97-
aws_s3_bucket_name: ${{ env.AWS_S3_BUCKET_NAME }}
98-
aws_s3_lock_bucket_name: ${{ env.AWS_S3_LOCK_BUCKET_NAME }}
99-
access_point_host: "production"
100-
run_id: ${{ github.run_id }}
101-
aws_region: ${{ env.AWS_REGION }}
102-
aws_role_session_name: ${{ env.AWS_ROLE_SESSION_NAME }}
103-
aws_role_arn: ${{ env.AWS_ROLE_ARN }}
104-
# used for signing package stuff
105-
gpg_passphrase: ${{ env.GPG_PASSPHRASE }}
106-
gpg_private_key_base64: ${{ env.GPG_PRIVATE_KEY_BASE64 }}
107-
disable_lock: true
71+
# publishing-to-s3-macos:
72+
# name: Publish macOS artifacts into s3 prod bucket
73+
# runs-on: ubuntu-20.04
74+
#
75+
# strategy:
76+
# max-parallel: 1
77+
# matrix:
78+
# assetsType:
79+
# - "targz"
80+
#
81+
# steps:
82+
# - name: Publish ${{ matrix.assetsType }} to S3 action
83+
# uses: newrelic/infrastructure-publish-action@v1.0.14
84+
# env:
85+
# AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
86+
# AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
87+
# AWS_ROLE_ARN: ${{ env.AWS_ROLE_ARN }}
88+
# AWS_ROLE_SESSION_NAME: ${{ env.AWS_ROLE_SESSION_NAME }}
89+
# with:
90+
# tag: ${{env.TAG}}
91+
# app_name: "newrelic-infra"
92+
# repo_name: "newrelic/infrastructure-agent"
93+
# schema: "custom"
94+
# schema_url: "https://raw.githubusercontent.com/newrelic/infrastructure-agent/${{ env.SCHEMA_BRANCH }}/build/upload-schema-macos-${{ matrix.assetsType }}.yml"
95+
# aws_access_key_id: ${{ env.AWS_ACCESS_KEY_ID }}
96+
# aws_secret_access_key: ${{ env.AWS_SECRET_ACCESS_KEY }}
97+
# aws_s3_bucket_name: ${{ env.AWS_S3_BUCKET_NAME }}
98+
# aws_s3_lock_bucket_name: ${{ env.AWS_S3_LOCK_BUCKET_NAME }}
99+
# access_point_host: "production"
100+
# run_id: ${{ github.run_id }}
101+
# aws_region: ${{ env.AWS_REGION }}
102+
# aws_role_session_name: ${{ env.AWS_ROLE_SESSION_NAME }}
103+
# aws_role_arn: ${{ env.AWS_ROLE_ARN }}
104+
# # used for signing package stuff
105+
# gpg_passphrase: ${{ env.GPG_PASSPHRASE }}
106+
# gpg_private_key_base64: ${{ env.GPG_PRIVATE_KEY_BASE64 }}
107+
# disable_lock: true
108108

109109
publishing-to-s3-windows:
110110
name: Publish windows artifacts into s3 prod bucket

0 commit comments

Comments
 (0)