Skip to content

Commit

Permalink
[devops-220] update pvs-studio version
Browse files Browse the repository at this point in the history
  • Loading branch information
ru-asdx committed Dec 19, 2024
1 parent d8557df commit 3808106
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 33 deletions.
29 changes: 0 additions & 29 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@ jobs:
- name: 'Set up Docker Buildx'
uses: docker/setup-buildx-action@v3

- name: 'Build android'
uses: docker/build-push-action@v6
with:
push: false
tags: ${{ steps.tag.outputs.image_name }}-android:${{ steps.tag.outputs.image_tag }}
cache-from: type=registry,ref=${{ steps.tag.outputs.image_name }}-android:buildcache
context: android

- name: 'Build flipperzero-firmware'
uses: docker/build-push-action@v6
with:
Expand All @@ -57,16 +49,6 @@ jobs:
cache-from: type=registry,ref=${{ steps.tag.outputs.image_name }}-fz-fw:buildcache
context: flipperzero-firmware

- name: 'Push android'
if: ${{ github.event_name != 'pull_request' }}
uses: docker/build-push-action@v6
with:
push: true
tags: ${{ steps.tag.outputs.image_name }}-android:${{ steps.tag.outputs.image_tag }}
cache-from: type=registry,ref=${{ steps.tag.outputs.image_name }}-android:buildcache
cache-to: type=registry,ref=${{ steps.tag.outputs.image_name }}-android:buildcache,mode=max
context: android

- name: 'Push flipperzero-firmware'
if: ${{ github.event_name != 'pull_request' }}
uses: docker/build-push-action@v6
Expand All @@ -77,17 +59,6 @@ jobs:
cache-to: type=registry,ref=${{ steps.tag.outputs.image_name }}-fz-fw:buildcache,mode=max
context: flipperzero-firmware

- name: 'Trigger k8s to use new image android: prod'
if: ${{ (github.event_name != 'pull_request')
&& (steps.tag.outputs.image_tag != '0.0.0')
&& (!endsWith(github.event.client_payload.image_tag, '-rc')) }}
uses: peter-evans/repository-dispatch@v3
with:
repository: ${{ secrets.BAREMETAL_INFRASTRUCTURE_REPO }}
token: ${{ secrets.K8S_GITHUB_PAT }}
event-type: github-actions-runner-android-deploy
client-payload: '{"image_tag": "${{steps.tag.outputs.image_tag}}"}'

- name: 'Trigger k8s to use new image flipperzero-firmware: prod'
if: ${{ (github.event_name != 'pull_request')
&& (steps.tag.outputs.image_tag != '0.0.0')
Expand Down
4 changes: 2 additions & 2 deletions android/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM summerwind/actions-runner-dind:v2.317.0-ubuntu-22.04
FROM summerwind/actions-runner-dind:v2.321.0-ubuntu-22.04

RUN DEBIAN_FRONTEND=noninteractive sudo apt update && sudo apt -y install wget apt-transport-https ca-certificates curl gnupg

Expand Down Expand Up @@ -33,5 +33,5 @@ RUN sudo chown -R runner:runner /opt/android_sdk/
RUN sdkmanager --install "platforms;android-34"

# Warmup project
RUN git clone --recurse-submodules https://github.com/flipperdevices/Flipper-Android-App.git -b 1.7.1.1656 /tmp/android-warmup/
RUN git clone --recurse-submodules https://github.com/flipperdevices/Flipper-Android-App.git -b 1.8.1.1862 /tmp/android-warmup/
RUN cd /tmp/android-warmup/ && ./gradlew assembleDebug && rm -rf /tmp/android-warmup/
4 changes: 2 additions & 2 deletions flipperzero-firmware/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM summerwind/actions-runner-dind:v2.317.0-ubuntu-22.04
FROM summerwind/actions-runner-dind:v2.321.0-ubuntu-22.04

RUN DEBIAN_FRONTEND=noninteractive sudo apt update && sudo apt -y install wget apt-transport-https ca-certificates curl gnupg

Expand All @@ -11,7 +11,7 @@ RUN sudo wget -O /etc/apt/sources.list.d/viva64.list https://cdn.pvs-studio.com/
RUN curl https://baltocdn.com/helm/signing.asc | sudo gpg --dearmor | sudo tee /usr/share/keyrings/helm.gpg > /dev/null
RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/helm.gpg] https://baltocdn.com/helm/stable/debian/ all main" | sudo tee /etc/apt/sources.list.d/helm-stable-debian.list

RUN DEBIAN_FRONTEND=noninteractive sudo apt update && sudo apt -y install pvs-studio=7.31.81895.392-1 kubectl helm python3-pip
RUN DEBIAN_FRONTEND=noninteractive sudo apt update && sudo apt -y install pvs-studio=7.34.87460.207-1 kubectl helm python3-pip

RUN sudo mkdir -p "/etc/docker"
RUN echo "{\"mtu\": 1454}" | sudo tee -a /etc/docker/daemon.json > /dev/null

0 comments on commit 3808106

Please sign in to comment.