Skip to content

Commit 004b79b

Browse files
harrryrharrryr
committed
Test
1 parent 06b8ef3 commit 004b79b

File tree

3 files changed

+56
-70
lines changed

3 files changed

+56
-70
lines changed

‎.github/actions/artifacts_build/action.yml‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -67,41 +67,41 @@ runs:
6767
cd ./aws-opentelemetry-distro
6868
python -m build --outdir ../dist
6969
70-
- name: Set up QEMU
71-
uses: docker/setup-qemu-action@v3
70+
# - name: Set up QEMU
71+
# uses: docker/setup-qemu-action@v3
7272

73-
- name: Set up Docker Buildx
74-
uses: docker/setup-buildx-action@v3
73+
# - name: Set up Docker Buildx
74+
# uses: docker/setup-buildx-action@v3
7575

76-
- name: Login to private AWS ECR
77-
if: ${{ inputs.push_image == true || inputs.push_image == 'true' }}
78-
uses: docker/login-action@v3
79-
with:
80-
registry: ${{ inputs.image_registry }}
81-
env:
82-
AWS_REGION: ${{ inputs.aws-region }}
76+
# - name: Login to private AWS ECR
77+
# if: ${{ inputs.push_image == true || inputs.push_image == 'true' }}
78+
# uses: docker/login-action@v3
79+
# with:
80+
# registry: ${{ inputs.image_registry }}
81+
# env:
82+
# AWS_REGION: ${{ inputs.aws-region }}
8383

84-
# Per https://docs.aws.amazon.com/AmazonECR/latest/public/docker-pull-ecr-image.html, it is possible to
85-
# make unauthorized calls to get public ECR images (needed to build the ADOT Python docker image), but
86-
# it can fail if you previously authenticated to a public repo. Adding this step to log out, so we
87-
# ensure we can make unauthenticated call. This is important for making the pr_build workflow run on
88-
# PRs created from forked repos.
89-
- name: Logout of public AWS ECR
90-
shell: bash
91-
run: docker logout public.ecr.aws
84+
# # Per https://docs.aws.amazon.com/AmazonECR/latest/public/docker-pull-ecr-image.html, it is possible to
85+
# # make unauthorized calls to get public ECR images (needed to build the ADOT Python docker image), but
86+
# # it can fail if you previously authenticated to a public repo. Adding this step to log out, so we
87+
# # ensure we can make unauthenticated call. This is important for making the pr_build workflow run on
88+
# # PRs created from forked repos.
89+
# - name: Logout of public AWS ECR
90+
# shell: bash
91+
# run: docker logout public.ecr.aws
9292

93-
- name: Build and push image according to input
94-
uses: docker/build-push-action@v5
95-
with:
96-
push: ${{ inputs.push_image }}
97-
context: .
98-
file: ./Dockerfile
99-
platforms: linux/amd64
100-
tags: ${{ inputs.image_uri_with_tag }}
101-
load: ${{ inputs.load_image }}
93+
# - name: Build and push image according to input
94+
# uses: docker/build-push-action@v5
95+
# with:
96+
# push: ${{ inputs.push_image }}
97+
# context: .
98+
# file: ./Dockerfile
99+
# platforms: linux/amd64
100+
# tags: ${{ inputs.image_uri_with_tag }}
101+
# load: ${{ inputs.load_image }}
102102

103-
- name: Perform image scan
104-
uses: ./.github/actions/image_scan
105-
with:
106-
image-ref: ${{ inputs.image_uri_with_tag }}
107-
severity: 'CRITICAL,HIGH,MEDIUM,LOW,UNKNOWN'
103+
# - name: Perform image scan
104+
# uses: ./.github/actions/image_scan
105+
# with:
106+
# image-ref: ${{ inputs.image_uri_with_tag }}
107+
# severity: 'CRITICAL,HIGH,MEDIUM,LOW,UNKNOWN'

‎.github/workflows/release_build.yml‎

Lines changed: 23 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ jobs:
2828
- name: Checkout Repo @ SHA - ${{ github.sha }}
2929
uses: actions/checkout@v4
3030

31-
# - name: Build Wheel and Image Files
32-
# uses: ./.github/actions/artifacts_build
33-
# with:
34-
# image_uri_with_tag: "adot-autoinstrumentation-python:test"
35-
# push_image: false
36-
# load_image: true
37-
# python_version: "3.10"
38-
# package_name: aws-opentelemetry-distro
39-
# os: ubuntu-latest
31+
- name: Build Wheel and Image Files
32+
uses: ./.github/actions/artifacts_build
33+
with:
34+
image_uri_with_tag: "adot-autoinstrumentation-python:test"
35+
push_image: false
36+
load_image: true
37+
python_version: "3.10"
38+
package_name: aws-opentelemetry-distro
39+
os: ubuntu-latest
4040

4141
# # TODO: Add some sort of smoke/integration testing before we go
4242
# # release the artifacts. adot java for reference:
@@ -89,15 +89,15 @@ jobs:
8989
# TWINE_USERNAME: '__token__'
9090
# TWINE_PASSWORD: ${{ env.TEST_PYPI_TOKEN_API_TOKEN }}
9191
# run: |
92-
# twine upload --repository testpypi --skip-existing --verbose dist/aws_opentelemetry_distro-${{ github.event.inputs.version }}-py3-none-any.whl
92+
# twine upload --repository testpypi --skip-existing --verbose dist/aws_opentelemetry_distro-0.7.0-py3-none-any.whl
9393

9494
# # Publish to prod PyPI
9595
# - name: Publish to PyPI
9696
# env:
9797
# TWINE_USERNAME: '__token__'
9898
# TWINE_PASSWORD: ${{ env.PROD_PYPI_TOKEN_API_TOKEN }}
9999
# run: |
100-
# twine upload --skip-existing --verbose dist/aws_opentelemetry_distro-${{ github.event.inputs.version }}-py3-none-any.whl
100+
# twine upload --skip-existing --verbose dist/aws_opentelemetry_distro-0.7.0-py3-none-any.whl
101101

102102
# # Publish to public ECR
103103
# - name: Build and push public ECR image
@@ -108,7 +108,7 @@ jobs:
108108
# file: ./Dockerfile
109109
# platforms: linux/amd64,linux/arm64
110110
# tags: |
111-
# ${{ env.RELEASE_PUBLIC_REPOSITORY }}:v${{ github.event.inputs.version }}
111+
# ${{ env.RELEASE_PUBLIC_REPOSITORY }}:v0.7.0
112112

113113
# # Publish to private ECR
114114
# - name: Build and push private ECR image
@@ -119,7 +119,7 @@ jobs:
119119
# file: ./Dockerfile
120120
# platforms: linux/amd64,linux/arm64
121121
# tags: |
122-
# ${{ env.RELEASE_PRIVATE_REPOSITORY }}:v${{ github.event.inputs.version }}
122+
# ${{ env.RELEASE_PRIVATE_REPOSITORY }}:v0.7.0
123123

124124
# Publish to GitHub releases
125125
- name: Create GH release
@@ -128,32 +128,18 @@ jobs:
128128
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
129129
run: |
130130
gh release create --target "$GITHUB_REF_NAME" \
131-
--title "Release v${{ github.event.inputs.version }}" \
131+
--title "Release v0.7.0" \
132132
--draft \
133-
"v${{ github.event.inputs.version }}" \
134-
dist/aws_opentelemetry_distro-${{ github.event.inputs.version }}-py3-none-any.whl
135-
136-
# - name: Get SHA256 checksum of wheel file
137-
# id: get_sha256
138-
# env:
139-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
140-
# run: |
141-
# checksum=$(shasum -a 256 dist/aws_opentelemetry_distro-${{ github.event.inputs.version }}-py3-none-any.whl | awk '{ print $1 }')
142-
# echo "CHECKSUM=$checksum" >> $GITHUB_OUTPUT
143-
144-
# - name: Append checksum and update version
145-
# env:
146-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
147-
# run: |
148-
# echo "aws_opentelemetry_distro-${{ github.event.inputs.version }}-py3-none-any.whl ${{ steps.get_sha256.outputs.CHECKSUM }}" >> checksum.txt
149-
# echo "${{ github.event.inputs.version }}" > version.txt
150-
151-
# git config --local user.email "github-actions[bot]@users.noreply.github.com"
152-
# git config --local user.name "GitHub Action Release Workflow"
153-
# git add checksum.txt version.txt
154-
# git commit -m "Update latest version and append checksum"
155-
# git push
133+
"v0.7.0" \
134+
dist/aws_opentelemetry_distro-0.7.0-py3-none-any.whl
156135
136+
- name: Get SHA256 checksum of wheel file
137+
id: get_sha256
138+
env:
139+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
140+
run: |
141+
checksum=$(shasum -a 256 dist/aws_opentelemetry_distro-0.7.0-py3-none-any.whl | awk '{ print $1 }')
142+
echo "aws_opentelemetry_distro-0.7.0-py3-none-any.whl: $checksum"
157143
158144
159145

‎version.txt‎

Whitespace-only changes.

0 commit comments

Comments
 (0)