Skip to content
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

Jump to bottom

Fix container job release for 3.x #5477

Merged
merged 5 commits into from
Jul 25, 2023
Merged

Fix container job release for 3.x #5477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
077f2b8
Fix container job release for 3.x
Jul 25, 2023
b126640
Hardcode tag
Jul 25, 2023
de1601d
Trigger
Jul 25, 2023
e859d58
Update .github/workflows/containers.yml
jumaffre Jul 25, 2023
ea93051
Update .github/workflows/containers.yml
jumaffre Jul 25, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ jobs:
echo "tag=${GITHUB_REF#refs/tags/ccf-}" >> $GITHUB_OUTPUT
id: tref

- name: Build ${{ matrix.type }} container for ${{ matrix.platform }}${{ matrix.run_js && ', (JS)' || '' }}
run: docker build -f docker/app_${{ matrix.type }} . --build-arg="platform=${{ matrix.platform }}" --build-arg="ansible_vars=ccf_ver=${{ steps.tref.outputs.tag }} ${{ matrix.run_js && 'run_js=true' || '' }}" -t $ACR_REGISTRY/public/ccf/app/${{ matrix.type }}${{ matrix.run_js && '-js' || '' }}:${{ steps.tref.outputs.tag }}-${{ matrix.platform }}
- name: Build ${{ matrix.type }} container for ${{ matrix.platform }}${{ matrix.run_js && ', (JS)' || '' }} using clang ${{ matrix.clang_version }}
run: docker build -f docker/app_${{ matrix.type }} . --build-arg="clang_version=${{ matrix.clang_version }}" --build-arg="platform=${{ matrix.platform }}" --build-arg="ansible_vars=ccf_ver=${{ steps.tref.outputs.tag }} ${{ matrix.run_js && 'run_js=true' || '' }}" -t $ACR_REGISTRY/public/ccf/app/${{ matrix.type }}${{ matrix.run_js && '-js' || '' }}:${{ steps.tref.outputs.tag }}-${{ matrix.platform }}

- name: Log in
run: docker login -u $ACR_TOKEN_NAME -p ${{ secrets.ACR_APP_PUSH_TOKEN_PASSWORD }} $ACR_REGISTRY
Expand Down
2 changes: 1 addition & 1 deletion docker/app_dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ COPY getting_started/setup_vm/ /tmp/setup_vm/
RUN apt update \
&& apt install -y ansible software-properties-common bsdmainutils dnsutils \
&& cd /tmp/setup_vm \
&& ansible-playbook app-dev.yml --extra-vars "$ansible_vars" --extra-vars "platform=${platform}" \
&& ansible-playbook app-dev.yml --extra-vars "$ansible_vars" --extra-vars "platform=${platform}" --extra-vars "clang_version=${clang_version}" \
&& rm -rf /tmp/* \
&& apt remove -y ansible software-properties-common \
&& apt -y autoremove \
Expand Down
2 changes: 1 addition & 1 deletion docker/app_run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ COPY getting_started/setup_vm/ /tmp/setup_vm/
RUN apt update \
&& apt install -y ansible software-properties-common curl bsdmainutils dnsutils \
&& cd /tmp/setup_vm \
&& ansible-playbook app-run.yml --extra-vars "$ansible_vars" --extra-vars "platform=${platform}" \
&& ansible-playbook app-run.yml --extra-vars "$ansible_vars" --extra-vars "platform=${platform}" --extra-vars "clang_version=${clang_version}" \
&& rm -rf /tmp/* \
&& apt remove -y ansible software-properties-common curl \
&& apt -y autoremove \
Expand Down
15 changes: 13 additions & 2 deletions getting_started/setup_vm/app-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
platform: "sgx"
clang_version: "11"
tasks:
- import_role:
name: llvm_repo
tasks_from: install.yml
when: clang_version == "15"
- import_role:
name: intel
tasks_from: sgx-psw.yml
Expand All @@ -15,14 +19,21 @@
- import_role:
name: az_dcap
tasks_from: install.yml

# If OE is already installed, we don't want to install hostverify as they are mutually
# exclusive. Non-SGX CCF builds can use either of them.
- name: Gather the package facts
ansible.builtin.package_facts:
manager: auto
- import_role:
name: openenclave
tasks_from: binary_install.yml
when: platform == "sgx"
when: (platform == "sgx") or ("open-enclave" in ansible_facts.packages)
- import_role:
name: openenclave
tasks_from: install_host_verify.yml
when: platform != "sgx"
when: (platform != "sgx") and ("open-enclave" not in ansible_facts.packages)

- import_role:
name: ccf_build
tasks_from: install.yml
Expand Down
12 changes: 12 additions & 0 deletions getting_started/setup_vm/app-run.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
platform: "sgx"
clang_version: "11"
tasks:
- import_role:
name: llvm_repo
tasks_from: install.yml
when: clang_version == "15"
- import_role:
name: intel
tasks_from: sgx-psw.yml
Expand All @@ -15,6 +19,14 @@
- import_role:
name: az_dcap
tasks_from: install.yml
- import_role:
name: openenclave
tasks_from: binary_install.yml
when: platform == "sgx"
- import_role:
name: openenclave
tasks_from: install_host_verify.yml
when: platform != "sgx"
- import_role:
name: ccf_install
tasks_from: deb_install.yml
Loading