Skip to content

update branch

update branch #37

Workflow file for this run

#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#
<<<<<<<< HEAD:.github/workflows/build_and_test_ansi.yml
name: "Build and test (ANSI)"

Check failure on line 21 in .github/workflows/build_main.yml

View workflow run for this annotation

GitHub Actions / .github/workflows/build_main.yml

Invalid workflow file

You have an error in your yaml syntax on line 21
========
name: "Build"
>>>>>>>> 17a8e67a6a03fd5a33f4ed078f8325665a0635aa:.github/workflows/build_main.yml
on:
push:
branches:
<<<<<<<< HEAD:.github/workflows/build_and_test_ansi.yml
- branch-3.3
jobs:
call-build-and-test:
name: Call main build
uses: ./.github/workflows/build_and_test.yml
if: github.repository == 'apache/spark'
with:
ansi_enabled: true
========
- '**'
jobs:
call-build-and-test:
permissions:
packages: write
name: Run
uses: ./.github/workflows/build_and_test.yml
>>>>>>>> 17a8e67a6a03fd5a33f4ed078f8325665a0635aa:.github/workflows/build_main.yml