Fixed merge issues
This commit is contained in:
5
.github/workflows/build.yml
vendored
5
.github/workflows/build.yml
vendored
@@ -5,6 +5,9 @@ on:
|
|||||||
- main
|
- main
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '20 20 * * *' # 8:20pm everyday
|
- cron: '20 20 * * *' # 8:20pm everyday
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
env:
|
env:
|
||||||
IMAGE_NAME: base
|
IMAGE_NAME: base
|
||||||
IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
|
IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
|
||||||
@@ -24,7 +27,7 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
# Checkout push-to-registry action GitHub repository
|
# Checkout push-to-registry action GitHub repository
|
||||||
- name: Checkout Push to Registry action
|
- name: Checkout Push to Registry action
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
- name: Generate tags
|
- name: Generate tags
|
||||||
id: generate-tags
|
id: generate-tags
|
||||||
|
|||||||
@@ -12,5 +12,5 @@ RUN rpm-ostree override remove firefox firefox-langpacks && \
|
|||||||
sed -i 's/#AutomaticUpdatePolicy.*/AutomaticUpdatePolicy=stage/' /etc/rpm-ostreed.conf && \
|
sed -i 's/#AutomaticUpdatePolicy.*/AutomaticUpdatePolicy=stage/' /etc/rpm-ostreed.conf && \
|
||||||
systemctl enable rpm-ostreed-automatic.timer && \
|
systemctl enable rpm-ostreed-automatic.timer && \
|
||||||
systemctl enable flatpak-automatic.timer && \
|
systemctl enable flatpak-automatic.timer && \
|
||||||
rpm-ostree cleanup -m && \
|
|
||||||
ostree container commit
|
ostree container commit
|
||||||
|
|||||||
Reference in New Issue
Block a user